From c1fc163a353b56c11a67766c36d5e984763468ff Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Thu, 27 Jun 2019 09:39:58 +0200
Subject: [PATCH 01/57] Build scripts refactoring (#121)

* Initial buildSrc support

* buildSrc: remove versioning and flavor related BuildConfig fields

* Removing scripts/CliqzConfig.gradle

* Cleaning up settings.gradle

* Setup Sentry for crash reporting

* Incremental builds

* Ignoring cliqz-config.json

* Kotlin support, moving all the keys/tokens to cliqz-config.json

* cliqz-config.json is optional, warning if missing
---
 .gitignore                                    |   1 +
 app/build.gradle                              |  53 +-----
 app/cliqz-config.json                         |  19 ---
 .../com/cliqz/browser/app/BrowserApp.java     |  20 ++-
 .../purchases/trial/TrialPeriodRemoteRepo.kt  |   4 +-
 buildSrc/build.gradle                         |  24 +++
 .../java/com/cliqz/gradle/CliqzConfigTask.kt  | 139 ++++++++++++++++
 .../main/java/com/cliqz/gradle/CliqzPlugin.kt |  75 +++++++++
 scripts/CliqzConfig.gradle                    | 155 ------------------
 settings.gradle                               |   4 +-
 10 files changed, 264 insertions(+), 230 deletions(-)
 delete mode 100644 app/cliqz-config.json
 create mode 100644 buildSrc/build.gradle
 create mode 100644 buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
 create mode 100644 buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
 delete mode 100644 scripts/CliqzConfig.gradle

diff --git a/.gitignore b/.gitignore
index bea9a2955..0e88695d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,4 @@ app/src/main/assets/jsengine.bundle.js
 node_modules/
 yarn.lock
 app/google-services.json
+app/cliqz-config.json
diff --git a/app/build.gradle b/app/build.gradle
index 60128206f..d31f0219e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,6 @@ apply plugin: 'kotlin-kapt'
 
 apply plugin: 'com.github.triplet.play'
 apply plugin: 'com.getkeepsafe.dexcount'
-apply from: '../scripts/CliqzConfig.gradle'
 apply from: 'cliqz.gradle'
 
 def useGoogleServices = System.getenv("DISABLE_GOOGLE_SERVICES") == null
@@ -25,22 +24,7 @@ android {
         buildConfigField 'String', 'LIGHTNING_VERSION_NAME', '"4.2.3.1"'
         buildConfigField "int", "MINIMUM_WEBVIEW_VERSION", "55"
         buildConfigField 'int', "VISIBLE_TOP_SITES", '4'
-
-        def vpnApiKey = this.hasProperty("com.cliqz.lumen.vpnApiKey") ?
-                this.getProperty("com.cliqz.lumen.vpnApiKey") : System.getenv("VPN_API_KEY")
-        if (vpnApiKey) {
-            buildConfigField 'String', 'VPN_API_KEY', "\"${vpnApiKey}\""
-        } else {
-            buildConfigField 'String', 'VPN_API_KEY', '""'
-        }
-
-        def revenueCatApiKey = this.hasProperty("com.cliqz.lumen.revenueCatApiKey") ?
-                this.getProperty("com.cliqz.lumen.revenueCatApiKey") : System.getenv("REVENUECAT_API_KEY")
-        if (revenueCatApiKey) {
-            buildConfigField 'String', 'REVENUECAT_API_KEY', "\"${revenueCatApiKey}\""
-        } else {
-            buildConfigField 'String', 'REVENUECAT_API_KEY', '""'
-        }
+        
         applicationId "com.cliqz.browser"
         testInstrumentationRunner "com.cliqz.browser.test.CustomTestRunner"
         vectorDrawables.useSupportLibrary = true
@@ -124,15 +108,6 @@ android {
             universalApk true
         }
     }
-
-    productFlavors.properties.names.each { name ->
-        defaultConfig {
-            def upperName = name.toUpperCase()
-            buildConfigField 'String', "FLAVOR_${upperName}", "\"${name}\""
-            buildConfigField 'boolean', "IS_${upperName}", "FLAVOR.equals(FLAVOR_${upperName})"
-            buildConfigField 'boolean', "IS_NOT_${upperName}", "!IS_${upperName}"
-        }
-    }
 }
 
 dexcount {
@@ -157,15 +132,10 @@ configurations.all {
                 details.useTarget group: details.requested.group, name: 'android-jsc-intl', version: 'r236355'
             }
         }
+        force "com.google.code.findbugs:jsr305:3.0.0"
     }
 }
 
-configurations.all {
-  resolutionStrategy {
-      force "com.google.code.findbugs:jsr305:3.0.0"
-  }
-}
-
 dependencies {
 
     // support libraries
@@ -260,6 +230,8 @@ dependencies {
     androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
     androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
 
+    // Sentry
+    implementation 'io.sentry:sentry-android:1.7.21'
     // Forcing version
     androidTestImplementation 'androidx.annotation:annotation:1.0.0'
     androidTestImplementation 'androidx.test:runner:1.1.0'
@@ -271,24 +243,11 @@ dependencies {
     testImplementation 'org.apache.velocity:velocity:1.7'
 }
 
-def abiCodes = ["armeabi-v7a": 2, "arm64-v8a": 4, "x86": 6, "x86_64": 8]
-import com.android.build.OutputFile
-
-preBuild.doLast {
-    android.applicationVariants.each { variant ->
-        def apiVersion = variant.productFlavors.get(0).versionCode
-        // set the composite code
-        variant.outputs.each { output ->
-            def abiVersion = abiCodes.get(output.getFilter(OutputFile.ABI)) ?: 1
-            def generatedVersionCode = android.defaultConfig.versionCode * 100 + apiVersion * 10 + abiVersion
-            output.versionCodeOverride = generatedVersionCode
-        }
-    }
-}
-
 play {
     track = 'alpha'
 }
 if (useGoogleServices) {
     apply plugin: 'com.google.gms.google-services'
 }
+
+apply plugin: com.cliqz.gradle.CliqzPlugin
\ No newline at end of file
diff --git a/app/cliqz-config.json b/app/cliqz-config.json
deleted file mode 100644
index 3b5c18728..000000000
--- a/app/cliqz-config.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  ".default": {
-    "amazonApplicationARN": "arn:aws:sns:us-east-1:141047255820:app/GCM/CLIQZ_Browser_for_Android",
-    "amazonSnsTopics": [ "arn:aws:sns:us-east-1:141047255820:mobile_news" ],
-    "amazonAccountID": "141047255820",
-    "amazonIdentityPoolID": "us-east-1:68bb8256-a533-4b93-b744-423518ef0f02",
-    "amazonUnauthRoleARN": "arn:aws:iam::141047255820:role/Cognito_CLIQZ_browser_androidUnauth_Role",
-    "amazonAuthRoleARN": "arn:aws:iam::141047255820:role/Cognito_CLIQZ_browser_androidAuth_Role"
-  },
-  "debug": {
-    "amazonSnsTopics": [ "arn:aws:sns:us-east-1:141047255820:mobile_news_staging" ]
-  },
-  "o2": {
-    "amazonSnsTopics": ["arn:aws:sns:us-east-1:141047255820:o2_android_browser"]
-  },
-  "lookback": {
-    "lookbackSdkToken": "HWiD4ErSbeNy9JcRg"
-  }
-}
diff --git a/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java b/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java
index c3ae68843..2da52195b 100644
--- a/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java
+++ b/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java
@@ -1,13 +1,15 @@
 package com.cliqz.browser.app;
 
 import com.cliqz.browser.BuildConfig;
+import com.cliqz.browser.CliqzConfig;
 import com.cliqz.browser.purchases.PurchasesManager;
 import com.revenuecat.purchases.Purchases;
+import de.blinkt.openvpn.core.StatusListener;
+import io.sentry.Sentry;
+import io.sentry.android.AndroidSentryClientFactory;
 
 import javax.inject.Inject;
 
-import de.blinkt.openvpn.core.StatusListener;
-
 /**
  * @author Ravjit Uppal
  */
@@ -20,17 +22,25 @@ public class BrowserApp extends BaseBrowserApp {
     public void init() {
         final StatusListener mStatus = new StatusListener();
         mStatus.init(getApplicationContext());
-
+        setupCrashReporting();
         getAppComponent().inject(this);
         setupSubscriptionSDK();
     }
 
+    private void setupCrashReporting() {
+        //noinspection ConstantConditions
+        if (!CliqzConfig.SENTRY_TOKEN.isEmpty()) {
+            Sentry.init(CliqzConfig.SENTRY_TOKEN, new AndroidSentryClientFactory(this));
+        }
+    }
+
     private void setupSubscriptionSDK() {
         //noinspection ConstantConditions
-        if (!BuildConfig.REVENUECAT_API_KEY.isEmpty()) {
+        if (!CliqzConfig.REVENUECAT_API_KEY.isEmpty()) {
             Purchases.setDebugLogsEnabled(BuildConfig.DEBUG);
-            Purchases.configure(this, BuildConfig.REVENUECAT_API_KEY);
+            Purchases.configure(this, CliqzConfig.REVENUECAT_API_KEY);
             purchasesManager.checkPurchases();
         }
     }
+
 }
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt b/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt
index f29d9b95e..43b91effa 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt
@@ -5,8 +5,8 @@ import android.content.Context
 import android.net.Uri
 import android.os.AsyncTask
 import android.provider.Settings
+import com.cliqz.browser.CliqzConfig
 import android.util.Log
-import com.cliqz.browser.BuildConfig
 import com.cliqz.browser.utils.HttpHandler
 import com.revenuecat.purchases.Purchases
 import de.blinkt.openvpn.ConfigConverter
@@ -23,7 +23,7 @@ private val TAG = TrialPeriodRemoteRepo::class.java.simpleName
 private const val CONTENT_TYPE_JSON = "application/json"
 private val LUMEN_CREDENTIAL_URL = URL("https://auth-staging.lumenbrowser.com/get_credentials")
 
-private val HEADERS = mapOf("x-api-key" to BuildConfig.VPN_API_KEY)
+private val HEADERS = mapOf("x-api-key" to CliqzConfig.VPN_API_KEY)
 
 class TrialPeriodRemoteRepo(private val context: Context) {
 
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
new file mode 100644
index 000000000..91be46e16
--- /dev/null
+++ b/buildSrc/build.gradle
@@ -0,0 +1,24 @@
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version '1.3.31'
+}
+repositories {
+    mavenCentral()
+    google()
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    implementation "com.android.tools.build:gradle:3.4.1"
+}
+
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
new file mode 100644
index 000000000..b1c961289
--- /dev/null
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
@@ -0,0 +1,139 @@
+package com.cliqz.gradle
+
+import com.android.build.gradle.tasks.GenerateBuildConfig
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.squareup.javawriter.JavaWriter
+import org.gradle.api.DefaultTask
+import org.gradle.api.logging.Logger
+import org.gradle.api.tasks.*
+import org.gradle.api.tasks.Optional
+import java.io.File
+import java.io.FileReader
+import java.io.FileWriter
+import java.util.*
+import javax.inject.Inject
+import javax.lang.model.element.Modifier
+import kotlin.reflect.KMutableProperty1
+import kotlin.reflect.full.declaredMemberProperties
+
+open class CliqzConfigTask @Inject constructor(
+        val buildConfigProvider: TaskProvider<GenerateBuildConfig>,
+        val flavorNames: Set<String>) : DefaultTask() {
+
+    val inputFile: File? by lazy {
+        val inFile = project.file(CLIQZ_CONFIG_JSON)
+        if (inFile.isFile) inFile else null
+    }
+        @Optional @InputFile get
+
+    private val buildConfigTask: GenerateBuildConfig by lazy { buildConfigProvider.get() }
+    private val packageName: String by lazy { buildConfigTask.buildConfigPackageName }
+
+    val outputDirectory: File by lazy {
+        File(buildConfigTask.sourceOutputDir, packageName.replace('.', File.separatorChar))
+    }
+        @OutputDirectory get
+
+    val outputFile: File by lazy {
+        File(outputDirectory, "CliqzConfig.java")
+    }
+        @OutputFile get
+
+    @TaskAction
+    fun generateCliqzConfig() {
+        // Read the json file
+        val type = MapTypeToken().type
+        val config = if (inputFile == null) {
+            logger.warn("Missing $CLIQZ_CONFIG_JSON")
+            Config()
+        } else FileReader(inputFile).use {
+            val configs = Gson().fromJson<Map<String, Config>>(it, type)
+            val defaultConfig = configs[DEFAULT_CONFIG_KEY] ?: Config()
+            val mergedConfig = configs.filter { (key, _) ->
+                flavorNames.contains(key)
+            }.values.fold(Config()) { result, other ->
+                result.merge(other, logger)
+            }
+            defaultConfig.merge(mergedConfig)
+            return@use defaultConfig
+        }
+
+        FileWriter(outputFile).use { writer ->
+            val javaWriter = JavaWriter(writer)
+            javaWriter.emitJavadoc("Auto generated, do not edit")
+                    .emitPackage(packageName)
+                    .beginType("CliqzConfig", "class", EnumSet.of(Modifier.PUBLIC, Modifier.FINAL))
+            Config::class.declaredMemberProperties.forEach { property ->
+                val allCapsKey = property.name.replace(Regex("([A-Z]+)"), "_\$1").toUpperCase()
+                val value = property.get(config)
+                when (value) {
+                    is String -> javaWriter.emitField(
+                            "String",
+                            allCapsKey,
+                            EnumSet.of(Modifier.PUBLIC, Modifier.FINAL, Modifier.STATIC),
+                            "\"${property.get(config)}\"")
+                    is List<*> -> javaWriter.emitField(
+                            "String[]",
+                            allCapsKey,
+                            EnumSet.of(Modifier.PUBLIC, Modifier.FINAL, Modifier.STATIC),
+                            value.joinToString(prefix = "new String[] {", postfix = "}", transform = { "\"$it\""})
+                    )
+                }
+            }
+            javaWriter.endType()
+        }
+    }
+
+
+    companion object {
+        private const val CLIQZ_CONFIG_JSON = "cliqz-config.json"
+        private const val DEFAULT_CONFIG_KEY = ".default"
+    }
+}
+private class MapTypeToken: TypeToken<Map<String, Config>>()
+
+// All the properties are only used via reflection, so they are "unused"
+@Suppress("unused")
+class Config {
+    var amazonAccountID = ""
+    var amazonAuthRoleARN = ""
+    var amazonUnauthRoleARN = ""
+    var amazonIdentityPoolID = ""
+    var amazonApplicationARN = ""
+    var amazonSnsTopics = mutableListOf<String>()
+    var vpnApiKey = ""
+    var revenuecatApiKey = ""
+    var sentryToken = ""
+
+    @Suppress("UNCHECKED_CAST")
+    fun merge(other: Config, logger: Logger? = null): Config {
+        Config::class.declaredMemberProperties.forEach { member ->
+            when (member.returnType.classifier) {
+                String::class -> mergeStringProperty(logger, other, member as KMutableProperty1<Config, String>)
+                MutableList::class -> mergeListProperty(other, member as KMutableProperty1<Config, List<String>>)
+                else -> logger?.error("Can't merge property ${member.name}")
+            }
+        }
+        return this
+    }
+
+    private fun mergeListProperty(other: Config, property: KMutableProperty1<Config, List<String>>) {
+        val topics = property.get(this).toMutableSet()
+        topics.addAll(property.get(other))
+        property.set(this, topics.toMutableList())
+    }
+
+    private fun mergeStringProperty(logger: Logger?, other: Config, property: KMutableProperty1<Config, String>) {
+        val v1 = property.get(this)
+        val v2 = property.get(other)
+        if (v1.isNotEmpty() && v2.isNotEmpty()) {
+            logger?.warn("Duplicated property ${property.name}")
+        }
+        if (v2.isNotEmpty()) {
+            property.set(this, v2)
+        }
+    }
+
+}
+
diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
new file mode 100644
index 000000000..9ec1a77cc
--- /dev/null
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
@@ -0,0 +1,75 @@
+package com.cliqz.gradle
+
+import com.android.build.OutputFile
+import com.android.build.gradle.AppExtension
+import com.android.build.gradle.api.ApkVariantOutput
+import com.android.build.gradle.api.ApplicationVariant
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+@Suppress("unused")
+class CliqzPlugin: Plugin<Project> {
+    override fun apply(project: Project) {
+        // TODO: Can this be moved to afterEvaluate too?
+        val android = project.property("android") as AppExtension
+        android.productFlavors.names.forEach {
+            android.defaultConfig.apply {
+                val upperName = it.toUpperCase()
+                buildConfigField("String", "FLAVOR_$upperName", "\"$it\"")
+                buildConfigField("boolean", "IS_$upperName", "FLAVOR.equals(FLAVOR_$upperName)")
+                buildConfigField("boolean", "IS_NOT_$upperName", "!IS_$upperName")
+            }
+        }
+
+        val defaultVersionCode = android.defaultConfig.versionCode
+        project.afterEvaluate {
+            android.applicationVariants.forEach { variant ->
+                setVersionCode(defaultVersionCode, variant)
+                createCliqzConfigTasks(project, variant)
+            }
+        }
+    }
+
+    private fun createCliqzConfigTasks(project: Project, variant: ApplicationVariant) {
+        val buildConfigProvider = variant.generateBuildConfigProvider
+        val javaCompileProvider = variant.javaCompileProvider
+        // val sourceOutdir = buildConfig.sourceOutputDir
+        val taskName = "generate${variant.name.capitalize()}CliqzConfig"
+        // val packageName = buildConfig.buildConfigPackageName
+        val builtType = variant.buildType.name
+        // This generate possible config names to look for in the json
+        val flavorNames = variant.productFlavors.fold(emptySet<String>()) { acc, productFlavor ->
+            acc + (listOf(productFlavor.name, "${productFlavor.name}${builtType.capitalize()}", builtType))
+        }
+
+        val taskProvider = project.tasks.register(taskName, CliqzConfigTask::class.java, buildConfigProvider, flavorNames)
+        taskProvider.configure {
+            it.dependsOn(buildConfigProvider)
+        }
+        project.tasks.named("compile${variant.name.capitalize()}Kotlin").configure {
+            it.dependsOn(taskProvider)
+        }
+        javaCompileProvider.configure {
+            it.dependsOn(taskProvider)
+        }
+    }
+
+    private fun setVersionCode(defaultVersionCode: Int, variant: ApplicationVariant) {
+        val apiVersion = variant.productFlavors[0].versionCode
+        variant.outputs.forEach { output ->
+            val abi = output.filters.find { it.filterType == OutputFile.ABI }
+            abi?.let {
+                val abiVersion = ABI_CODES[it.identifier]
+                (output as ApkVariantOutput).versionCodeOverride =
+                        defaultVersionCode * 100 + apiVersion * 10 + abiVersion!!
+            }
+        }
+    }
+
+
+
+    companion object {
+        private val ABI_CODES = mapOf(
+                "armeabi-v7a" to 2, "arm64-v8a" to 4, "x86" to 6, "x86_64" to 8)
+    }
+}
\ No newline at end of file
diff --git a/scripts/CliqzConfig.gradle b/scripts/CliqzConfig.gradle
deleted file mode 100644
index 65c9e816b..000000000
--- a/scripts/CliqzConfig.gradle
+++ /dev/null
@@ -1,155 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
-    }
-}
-
-
-import com.squareup.javawriter.JavaWriter
-import groovy.json.JsonSlurper
-import javax.lang.model.element.Modifier
-
-apply plugin: CliqzPlugin
-
-/**
- * Add a custom task to generate CLIQZ specific configuration file
- * Example structure for the config file:<br>
- * <pre>
- * {
- *   ".default": {
- *     "amazonSnsTopics": [ "<i>default_topic_arn</i>" ],
- *     "amazonApplicationARN": "...",
- *     "amazonAccountID": "...",
- *     "amazonIdentityPoolID": "...",
- *     "amazonUnauthRoleARN": "...",
- *     "amazonAuthRoleARN": "..."
- *   },
- *   "demo": {
- *     "amazonAccountID": "...",
- *     "amazonSnsTopics": [ "<i>demo_topic_arn</i>" ]
- *   },
- *   "full": {
- *     "amazonSnsTopics": [ "<i>full_topic_arn</i>" ]
- *   },
- *   "demoDebug": {
- *     ...
- *   },
- *   "demoRelease": {
- *     ...
- *   }
- * }
- * </pre>
- */
-class CliqzPlugin implements Plugin<Project> {
-
-    final static String CLIQZ_CONFIG_FILENAME = "CliqzConfig.java"
-    final def configModifier = EnumSet.of(Modifier.FINAL, Modifier.PUBLIC,Modifier.STATIC)
-    final static String CLIQZ_CONFIG_JSON = "cliqz-config.json"
-    def logger
-
-    void apply(Project project) {
-        if (!project.plugins.hasPlugin('com.android.application')) {
-            throw new IllegalArgumentException('Not an android app')
-        }
-        logger = project.logger
-        File configFile = project.file(CLIQZ_CONFIG_JSON)
-        if (!configFile.isFile()) {
-            logger.warn("Missing configuration file: ${configFile}")
-            return
-        }
-
-        JsonSlurper slurper = new JsonSlurper();
-        def config = slurper.parse(configFile)
-        project.afterEvaluate {
-            project.android.applicationVariants.each { variant ->
-                def buildConfig = variant.generateBuildConfigProvider.get()
-                def compileProvider = variant.javaCompileProvider
-                File sourceOutDir = buildConfig.sourceOutputDir
-                String packageName = buildConfig.getBuildConfigPackageName()
-                String taskName = buildConfig.name.replace('BuildConfig', 'CliqzConfig')
-                def buildType = variant.buildType.name
-                def flavorNames = variant.productFlavors.inject(new TreeSet()) { acc, value ->
-                    acc += [ value.name as String, "${value.name}${buildType.capitalize()}" as String, buildType as String ]
-                    acc
-                }
-                def variantConfig = config.findAll { flavorNames.contains(it.key) || it.key == '.default' }
-
-                Task task = buildTask(project, taskName, variantConfig, packageName, sourceOutDir)
-                task.mustRunAfter(buildConfig)
-                compileProvider.get().dependsOn(task)
-            }
-        }
-    }
-
-
-    Task buildTask(Project project, String taskName, Map config, String packageName, File dstDir) {
-        project.task(taskName) {
-            doLast {
-                def cfg = mergeConfig(config)
-                File packageOutDir = new File(dstDir, packageName.replace('.' as char, File.separatorChar))
-                def outFile = new File(packageOutDir, CLIQZ_CONFIG_FILENAME)
-                outFile.withWriter { writer ->
-                    JavaWriter javaWriter = new JavaWriter(writer)
-                    javaWriter.emitJavadoc('Auto generated, do not edit')
-                            .emitPackage(packageName)
-                            .beginType('CliqzConfig', 'class', EnumSet.of(Modifier.PUBLIC, Modifier.FINAL))
-
-                    cfg.each {
-                        def ALLCAPS_KEY = it.key.replaceAll("([A-Z]+)", "_\$1").toUpperCase()
-                        if (it.key == 'amazonSnsTopics') {
-                            javaWriter.emitField('String[]', ALLCAPS_KEY, configModifier, "new String[] {${it.value.join(',')}}")
-                        } else {
-                            javaWriter.emitField('String', ALLCAPS_KEY, configModifier, it.value ? "\"${it.value}\"": 'null')
-                        }
-                    }
-                    javaWriter.endType()
-                }
-            }
-        }
-    }
-
-    Object mergeConfig(Map config) {
-        def result = [
-                amazonAccountID:null,
-                amazonAuthRoleARN:null,
-                amazonUnauthRoleARN:null,
-                amazonIdentityPoolID:null,
-                amazonApplicationARN:null,
-                lookbackSdkToken:null
-        ]
-        def defaultConfig = config['.default']
-        config.remove('.default')
-        result.each { result[it.key] = mergeKey(config, defaultConfig, it.key) }
-        result['amazonSnsTopics'] = mergeTopics(config, defaultConfig)
-        result
-    }
-
-    List mergeTopics(Map config, Map defaultConfig) {
-        def topics = config.inject(new TreeSet()) { acc, it ->
-            def entries = it.value['amazonSnsTopics']
-            if (entries) {
-                acc += entries.collect { value -> "\"${value}\""}
-            }
-            acc
-        }
-        if (defaultConfig?.get('amazonSnsTopics')) {
-            topics += defaultConfig?.get('amazonSnsTopics')?.collect { "\"${it}\"" }
-        }
-        topics.toList()
-    }
-
-    String mergeKey(Map config, Map defaultConfig, String key) {
-        def result = config.inject(null) { result, val ->
-            if (result != null) {
-                logger.warn("Multiple ${key}")
-            }
-            result = val.value[key]
-            result
-        }
-        result ? result : defaultConfig?.get(key)
-    }
-}
diff --git a/settings.gradle b/settings.gradle
index db534a493..46c7e2771 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include ':app', ':oss', ':utils', ':android_utils', ':testdroid'
+include ':app', ':utils', ':android_utils', ':testdroid'
 
 include ':react-native-fs'
 project(':react-native-fs').projectDir = new File(settingsDir, 'node_modules/react-native-fs/android')
@@ -16,4 +16,4 @@ include ':react-native-share'
 project(':react-native-share').projectDir = new File(settingsDir, 	'node_modules/react-native-share/android')
 
 include ':react-native-user-agent-react-native-user-agent'
-project(':react-native-user-agent-react-native-user-agent').projectDir = new File(settingsDir, 	'node_modules/react-native-user-agent/android')
\ No newline at end of file
+project(':react-native-user-agent-react-native-user-agent').projectDir = new File(settingsDir, 'node_modules/react-native-user-agent/android')

From 73baef24b8ca79f077e690dc69db79b8f881cb28 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Thu, 27 Jun 2019 17:44:13 +0200
Subject: [PATCH 02/57] AP-274 lock icon in the title bar (#129)

---
 .../java/com/cliqz/utils/ResourcesUtils.java  | 28 --------
 .../cliqz/res/layout/search_bar_widget.xml    | 11 +++-
 app/src/cliqz/res/values/colors.xml           |  2 +
 .../res/layout/fragment_search_toolbar.xml    |  4 +-
 .../lumen/res/layout/search_bar_widget.xml    | 19 ++++--
 .../com/cliqz/browser/main/TabFragment.java   | 10 ++-
 .../com/cliqz/browser/widget/SearchBar.java   | 64 +++++++++++++------
 app/src/main/res/drawable/ic_lock_black.xml   |  9 +++
 app/src/main/res/values/dimens.xml            |  2 +-
 9 files changed, 94 insertions(+), 55 deletions(-)
 delete mode 100644 android_utils/src/main/java/com/cliqz/utils/ResourcesUtils.java
 create mode 100644 app/src/main/res/drawable/ic_lock_black.xml

diff --git a/android_utils/src/main/java/com/cliqz/utils/ResourcesUtils.java b/android_utils/src/main/java/com/cliqz/utils/ResourcesUtils.java
deleted file mode 100644
index 0772f52d9..000000000
--- a/android_utils/src/main/java/com/cliqz/utils/ResourcesUtils.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.cliqz.utils;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-/**
- * @author Stefano Pacifici
- * @date 2016/09/13
- */
-public final class ResourcesUtils {
-
-    private ResourcesUtils() {} // No instances
-
-    public static Drawable getDrawable(@NonNull Context context, @DrawableRes int drawable,
-                                       @Nullable Resources.Theme theme) {
-        final Resources resources = context.getResources();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            return resources.getDrawable(drawable, theme);
-        } else {
-            return resources.getDrawable(drawable);
-        }
-    }
-}
diff --git a/app/src/cliqz/res/layout/search_bar_widget.xml b/app/src/cliqz/res/layout/search_bar_widget.xml
index 3c7e4b324..8d97de27f 100644
--- a/app/src/cliqz/res/layout/search_bar_widget.xml
+++ b/app/src/cliqz/res/layout/search_bar_widget.xml
@@ -5,8 +5,18 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:background="@drawable/searchbar_background"
+    android:gravity="center_vertical"
     android:orientation="horizontal">
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/icon_lock"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_lock_black"
+        app:tint="@color/search_lock_color"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
     <TextView
         android:id="@+id/title_bar"
         android:layout_width="0dp"
@@ -20,7 +30,6 @@
         android:paddingLeft="8dp"
         android:textColor="#333333"
         android:textSize="15sp"
-        android:contentDescription="@string/descr_search_bar"
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:layout_weight="1" />
diff --git a/app/src/cliqz/res/values/colors.xml b/app/src/cliqz/res/values/colors.xml
index 711e25567..a9aec6a50 100644
--- a/app/src/cliqz/res/values/colors.xml
+++ b/app/src/cliqz/res/values/colors.xml
@@ -76,4 +76,6 @@
     <color name="fresh_tab_news_background_color">#CFFF</color>
     <color name="progress_bar_bg">#E7ECEE</color>
     <color name="progress_bar_color">#2B5993</color>
+
+    <color name="search_lock_color">@color/primary_color</color>
 </resources>
diff --git a/app/src/lumen/res/layout/fragment_search_toolbar.xml b/app/src/lumen/res/layout/fragment_search_toolbar.xml
index ae8db12c1..8c642c869 100644
--- a/app/src/lumen/res/layout/fragment_search_toolbar.xml
+++ b/app/src/lumen/res/layout/fragment_search_toolbar.xml
@@ -17,8 +17,8 @@
         android:layout_height="wrap_content"
         tools:layout_height="30dp"
         tools:background="@color/white"
-        android:paddingLeft="@dimen/toolbar_padding"
-        android:paddingRight="@dimen/toolbar_padding"
+        android:layout_marginStart="@dimen/toolbar_padding"
+        android:layout_marginEnd="@dimen/toolbar_padding"
         android:layout_weight="1"/>
 
     <ImageButton
diff --git a/app/src/lumen/res/layout/search_bar_widget.xml b/app/src/lumen/res/layout/search_bar_widget.xml
index c90218427..d32117c76 100644
--- a/app/src/lumen/res/layout/search_bar_widget.xml
+++ b/app/src/lumen/res/layout/search_bar_widget.xml
@@ -1,15 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    tools:background="#aaa">
+    tools:background="@color/gray_dark">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/icon_lock"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_lock_black"
+        app:tint="@color/white"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/title_bar_h"
-        android:background="@drawable/tab_item_bg_normal"
         android:gravity="start|center_vertical"
         android:hint="@string/url_bar_search_hint"
         android:paddingStart="8dp"
@@ -21,4 +32,4 @@
         android:textColorHint="@color/url_bar_hint_text_color"
         android:textSize="15sp" />
 
-</FrameLayout>
+</LinearLayout>
diff --git a/app/src/main/java/com/cliqz/browser/main/TabFragment.java b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
index b48b236be..8f05dca32 100644
--- a/app/src/main/java/com/cliqz/browser/main/TabFragment.java
+++ b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
@@ -741,6 +741,7 @@ public void updateUrl(BrowserEvents.UpdateUrl event) {
         if (url != null && !url.isEmpty() && !url.contains(TrampolineConstants.TRAMPOLINE_COMMAND_PARAM_NAME)) {
             state.setUrl(url);
             searchBar.setTitle(url);
+            searchBar.setSecure(isHttpsUrl(url));
         }
     }
 
@@ -748,7 +749,9 @@ private void bringWebViewToFront(Animation animation) {
         final WebView webView = mLightningView.getWebView();
         searchBar.showTitleBar();
         searchBar.showProgressBar();
-        searchBar.setTitle(BuildConfig.IS_LUMEN ? webView.getUrl() : webView.getTitle());
+        final String url = webView.getUrl();
+        searchBar.setTitle(BuildConfig.IS_LUMEN ? url : webView.getTitle());
+        searchBar.setSecure(isHttpsUrl(url));
         searchBar.setAntiTrackingDetailsVisibility(View.VISIBLE);
         webView.setAnimation(animation);
         webView.bringToFront();
@@ -764,6 +767,10 @@ private void bringWebViewToFront(Animation animation) {
         }
     }
 
+    private boolean isHttpsUrl(@Nullable String url) {
+        return url != null && url.startsWith("https://");
+    }
+
     private void updateToolbarContainer(@NonNull Context context, boolean isBackgroundEnabled) {
         if (mIsIncognito) {
             appBackgroundManager.setViewBackgroundColor(toolBarContainer,
@@ -872,6 +879,7 @@ public void openLink(String eventUrl, boolean reset, boolean fromHistory, Animat
         final String url = builder.build().toString();
         mLightningView.loadUrl(url);
         searchBar.setTitle(eventUrl);
+        searchBar.setSecure(isHttpsUrl(eventUrl));
         bringWebViewToFront(animation);
         if (quickAccessBar != null) {
             quickAccessBar.hide();
diff --git a/app/src/main/java/com/cliqz/browser/widget/SearchBar.java b/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
index a4307ecb1..0415fd2a4 100644
--- a/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
+++ b/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
@@ -3,7 +3,6 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Handler;
@@ -24,9 +23,10 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
 import androidx.core.content.ContextCompat;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 
+import com.cliqz.browser.BuildConfig;
 import com.cliqz.browser.R;
 import com.cliqz.browser.app.BrowserApp;
 import com.cliqz.browser.main.Messages;
@@ -35,7 +35,6 @@
 import com.cliqz.nove.Subscribe;
 
 import java.util.Locale;
-import java.util.Objects;
 
 import javax.inject.Inject;
 
@@ -49,6 +48,8 @@
  */
 public class SearchBar extends FrameLayout {
 
+    public static final String HTTPS_PREFIX = "HTTPS://";
+    public static final String HTTP_PREFIX = "HTTP://";
     private float scaleX;
     private float scaleY;
     private float pivotX;
@@ -66,6 +67,9 @@ public interface Listener extends TextWatcher, OnFocusChangeListener {
     @Inject
     QueryManager queryManager;
 
+    @BindView(R.id.icon_lock)
+    AppCompatImageView lock;
+
     @BindView(R.id.title_bar)
     TextView titleBar;
 
@@ -97,10 +101,6 @@ public SearchBar(Context context, AttributeSet attrs, int defStyle) {
         bus.register(this);
         inflate(getContext(), R.layout.search_bar_widget, this);
         ButterKnife.bind(this);
-        final Drawable clearIcon = VectorDrawableCompat.create(
-                context.getResources(), R.drawable.ic_clear_black, null);
-        final int clearIconHeight = Objects.requireNonNull(clearIcon).getIntrinsicHeight();
-        titleBar.setHeight(clearIconHeight);
         if (trackerCounter != null) {
             trackerCounter.setFocusable(false);
             trackerCounter.setFocusableInTouchMode(false);
@@ -226,7 +226,7 @@ public void selectAllText() {
                 searchEditText.setSelection(0,getSearchText().length()), 200);
     }
 
-    public void setTitle(String title) {
+    public void setTitle(@Nullable String title) {
         // Be sure to not set the trampoline as the title
         final String nnTitle = title == null ? "" : title;
         final Uri titleAsUri = Uri.parse(nnTitle);
@@ -234,7 +234,20 @@ public void setTitle(String title) {
                 .getQueryParameter(TrampolineConstants.TRAMPOLINE_COMMAND_PARAM_NAME) != null) {
             return;
         }
-        titleBar.setText(title);
+        final String upperCaseTitle = nnTitle.toUpperCase();
+        final String cleanTitle;
+        if (upperCaseTitle.startsWith(HTTPS_PREFIX)) {
+            cleanTitle = nnTitle.substring(HTTPS_PREFIX.length());
+        } else if (upperCaseTitle.startsWith(HTTP_PREFIX)) {
+            cleanTitle = nnTitle.substring(HTTP_PREFIX.length());
+        } else {
+            cleanTitle = nnTitle;
+        }
+        titleBar.setText(cleanTitle);
+    }
+
+    public void setSecure(boolean secure) {
+        lock.setVisibility(secure ? VISIBLE : GONE);
     }
 
     public void setQuery(String query) {
@@ -304,16 +317,31 @@ public boolean onInterceptTouchEvent(MotionEvent event) {
      * @param isIncognito True if the current tab is in incognito mode
      */
     public void setStyle(boolean isIncognito) {
-        if (isIncognito) {
-            searchEditText.setTextColor(ContextCompat.getColor(getContext(), R.color.url_bar_text_color_incognito));
-            searchEditText.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.url_bar_bg_incognito));
-            titleBar.setTextColor(ContextCompat.getColor(getContext(), R.color.url_bar_text_color_incognito));
-            titleBar.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.url_bar_bg_incognito));
+        final Context context = getContext();
+        if (BuildConfig.IS_NOT_LUMEN) {
+            if (isIncognito) {
+                searchEditText.setTextColor(ContextCompat.getColor(context, R.color.url_bar_text_color_incognito));
+                searchEditText.setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_incognito));
+                titleBar.setTextColor(ContextCompat.getColor(context, R.color.url_bar_text_color_incognito));
+                titleBar.setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_incognito));
+            } else {
+                searchEditText.setTextColor(ContextCompat.getColor(context, R.color.url_bar_text_color_normal));
+                searchEditText.setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_normal));
+                titleBar.setTextColor(ContextCompat.getColor(context, R.color.url_bar_text_color_normal));
+                titleBar.setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_normal));
+            }
         } else {
-            searchEditText.setTextColor(ContextCompat.getColor(getContext(), R.color.url_bar_text_color_normal));
-            searchEditText.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.url_bar_bg_normal));
-            titleBar.setTextColor(ContextCompat.getColor(getContext(), R.color.url_bar_text_color_normal));
-            titleBar.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.url_bar_bg_normal));
+            if (isIncognito) {
+                searchEditText.setTextColor(ContextCompat.getColor(context, R.color.url_bar_text_color_incognito));
+                searchEditText.setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_incognito));
+                titleBar.setTextColor(ContextCompat.getColor(context, R.color.url_bar_text_color_incognito));
+                setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_incognito));
+            } else {
+                searchEditText.setTextColor(ContextCompat.getColor(context, R.color.url_bar_text_color_normal));
+                searchEditText.setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_normal));
+                titleBar.setTextColor(ContextCompat.getColor(context, R.color.url_bar_text_color_normal));
+                setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_normal));
+            }
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_lock_black.xml b/app/src/main/res/drawable/ic_lock_black.xml
new file mode 100644
index 000000000..67a7c73ab
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+</vector>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 8fdc819b7..433c0c538 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -13,7 +13,7 @@
     <dimen name="toolbar_menu_icon_w">24.0dp</dimen>
     <dimen name="toolbar_padding">12.0dp</dimen>
     <dimen name="control_center_layout_w">50.0dp</dimen>
-    <dimen name="title_bar_h">32dp</dimen>
+    <dimen name="title_bar_h">24dp</dimen>
     <dimen name="fallback_logo_text_size">80sp</dimen>
     <dimen name="tab_icon_size">100dp</dimen>
     <dimen name="favorites_side_margins">20dp</dimen>

From d45492f418b189abe57dbc8fe8915ce79e55fe5b Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Thu, 27 Jun 2019 17:44:31 +0200
Subject: [PATCH 03/57] AP-330 unified status bar color (#130)

---
 app/src/cliqz/AndroidManifest.xml             | 10 ++++++
 .../browser/starttab/freshtab/FreshTab.kt     |  7 ++--
 app/src/main/AndroidManifest.xml              | 25 ++++++-------
 .../com/cliqz/browser/main/MainActivity.java  | 36 +++++++------------
 .../com/cliqz/browser/main/TabFragment.java   | 32 ++++++++++++-----
 app/src/main/res/values-v21/styles.xml        | 13 ++++++-
 6 files changed, 73 insertions(+), 50 deletions(-)
 create mode 100644 app/src/cliqz/AndroidManifest.xml

diff --git a/app/src/cliqz/AndroidManifest.xml b/app/src/cliqz/AndroidManifest.xml
new file mode 100644
index 000000000..34f69a8a3
--- /dev/null
+++ b/app/src/cliqz/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.cliqz.browser">
+
+    <application tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name=".connect.SyncActivity" android:exported="false"
+            android:theme="@style/Theme.AppCompat" android:screenOrientation="portrait" />
+    </application>
+
+</manifest>
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/freshtab/FreshTab.kt b/app/src/lumen/java/com/cliqz/browser/starttab/freshtab/FreshTab.kt
index 561d5cbbe..9d7329e8b 100644
--- a/app/src/lumen/java/com/cliqz/browser/starttab/freshtab/FreshTab.kt
+++ b/app/src/lumen/java/com/cliqz/browser/starttab/freshtab/FreshTab.kt
@@ -85,6 +85,10 @@ internal class FreshTab : StartTabFragment() {
         } else {
             getTrialPeriod(Messages.OnTrialPeriodResponse())
         }
+
+        trial_period_lumen_upgrade.setOnClickListener {
+            bus.post(Messages.GoToPurchase(0))
+        }
     }
 
     @Subscribe
@@ -136,9 +140,6 @@ internal class FreshTab : StartTabFragment() {
         trial_over_lumen_upgrade.visibility = View.GONE
         trial_period_upgrade_description.text =
                 resources.getQuantityString(R.plurals.trial_period_upgrade_description, daysLeft, daysLeft)
-        trial_period_lumen_upgrade.setOnClickListener {
-            bus.post(Messages.GoToPurchase(0))
-        }
     }
 
     private fun hideAllTrialPeriodViews() {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 54acb09db..f3a85b3ab 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -131,12 +131,20 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".connect.SyncActivity" android:exported="false"
-            android:theme="@style/Theme.AppCompat" android:screenOrientation="portrait" />
-
         <activity android:name=".qrscanner.CodeScannerActivity" android:exported="false"
             android:theme="@style/Theme.AppCompat" android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".settings.EulaSettingActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:label="@string/title_activity_eula_setting"
+            android:theme="@style/Theme.SettingsTheme" />
+
+        <activity android:name=".main.search.PrivacyPolicyActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
+            android:label="@string/privacy_policy_title"
+            android:theme="@style/Theme.SettingsTheme" />
+
         <receiver
             android:name=".telemetry.InstallReferrerReceiver"
             android:exported="true">
@@ -225,17 +233,6 @@
             android:authorities="${applicationId}.FacebookInitProvider"
             android:exported="false"
             tools:node="remove" />
-
-        <activity
-            android:name=".settings.EulaSettingActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/title_activity_eula_setting"
-            android:theme="@style/Theme.SettingsTheme" />
-        <activity android:name=".main.search.PrivacyPolicyActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
-            android:label="@string/privacy_policy_title"
-            android:theme="@style/Theme.SettingsTheme"
-            />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/cliqz/browser/main/MainActivity.java b/app/src/main/java/com/cliqz/browser/main/MainActivity.java
index 670554c2f..59b1f62eb 100644
--- a/app/src/main/java/com/cliqz/browser/main/MainActivity.java
+++ b/app/src/main/java/com/cliqz/browser/main/MainActivity.java
@@ -10,7 +10,6 @@
 import android.app.SearchManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageInfo;
@@ -24,7 +23,6 @@
 import android.util.Log;
 import android.util.Patterns;
 import android.view.MenuItem;
-import android.view.View;
 import android.view.WindowManager;
 import android.widget.Toast;
 
@@ -112,11 +110,9 @@ public class MainActivity extends AppCompatActivity implements ActivityComponent
     private CustomViewHandler mCustomViewHandler;
     protected String currentMode;
     private boolean mIsColdStart = true;
-    private boolean mShouldShowLookbackDialog = true;
     private final HashSet<Long> downloadIds = new HashSet<>();
     private final FileChooserHelper fileChooserHelper = new FileChooserHelper(this);
     private BroadcastReceiver mDownoloadCompletedBroadcastReceiver = null;
-    private ProgressDialog progressDialog = null;
 
     private PurchaseFragment purchaseFragment;
 
@@ -194,7 +190,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 isIncognito = false;
                 url = null;
                 query = null;
-                progressDialog = new ProgressDialog(this);
+                final ProgressDialog progressDialog = new ProgressDialog(this);
                 progressDialog.setIndeterminate(true);
                 progressDialog.show();
                 // TODO This break the news on Cliqz. Please, move the loader to the proper, flavor dependent spot
@@ -232,7 +228,6 @@ protected void onCreate(Bundle savedInstanceState) {
         if (isNotificationClicked) {
             sendNotificationClickedTelemetry(intent);
         }
-        //noinspection ConstantConditions
         if (!isRestored || url != null || query != null) {
             firstTabBuilder = tabsManager.buildTab();
             firstTabBuilder.setForgetMode(isIncognito);
@@ -270,12 +265,10 @@ protected void onCreate(Bundle savedInstanceState) {
             final AlertDialog.Builder builder = new AlertDialog.Builder(this);
             builder.setMessage(R.string.update_webview_msg)
                     .setCancelable(false)
-                    .setPositiveButton(R.string.update, new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int id) {
-                            startActivity(new Intent(Intent.ACTION_VIEW,
-                                    Uri.parse("market://details?id=" + WEBVIEW_PACKAGE_NAME)));
-                            finish();
-                        }
+                    .setPositiveButton(R.string.update, (dialog, id) -> {
+                        startActivity(new Intent(Intent.ACTION_VIEW,
+                                Uri.parse("market://details?id=" + WEBVIEW_PACKAGE_NAME)));
+                        finish();
                     });
             AlertDialog alert = builder.create();
             alert.show();
@@ -477,6 +470,7 @@ private void performExitCleanUp() {
             WebUtils.clearWebStorage(this);
             final File file = new File(getApplicationInfo().dataDir+"/app_webview", "historyManager-journal");
             if (file.exists()) {
+                //noinspection ResultOfMethodCallIgnored
                 file.delete();
             }
         }
@@ -484,6 +478,7 @@ private void performExitCleanUp() {
             WebUtils.clearCookies(this);
             final File file = new File(getApplicationInfo().dataDir+"/app_webview", "Cookies-journal");
             if (file.exists()) {
+                //noinspection ResultOfMethodCallIgnored
                 file.delete();
             }
 
@@ -502,12 +497,7 @@ public void onBackPressed() {
     public void openLinkInNewTab(BrowserEvents.OpenUrlInNewTab event) {
         createTab(event.url, event.isIncognito, event.showImmediately);
         bus.post(new Messages.UpdateTabCounter(tabsManager.getTabCount()));
-        Utils.showSnackbar(this, getString(R.string.tab_created), getString(R.string.view), new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                tabsManager.showTab(tabsManager.getTabCount() - 1);
-            }
-        });
+        Utils.showSnackbar(this, getString(R.string.tab_created), getString(R.string.view), v -> tabsManager.showTab(tabsManager.getTabCount() - 1));
     }
 
     @Subscribe
@@ -753,13 +743,11 @@ private boolean shouldUpdateWebview() {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         final int id = item.getItemId();
-        switch (id) {
-            case android.R.id.home:
-                onBackPressed();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
+        if (id == android.R.id.home) {
+            onBackPressed();
+            return true;
         }
+        return super.onOptionsItemSelected(item);
     }
 
     @Override
diff --git a/app/src/main/java/com/cliqz/browser/main/TabFragment.java b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
index 8f05dca32..f14743a49 100644
--- a/app/src/main/java/com/cliqz/browser/main/TabFragment.java
+++ b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
@@ -86,7 +86,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
 import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 import javax.inject.Inject;
 
@@ -1381,15 +1387,25 @@ private void updateUI() {
             final Context wrapper = new ContextThemeWrapper(activity, themeId);
             final Resources.Theme theme = wrapper.getTheme();
 
-            final TypedArray typedArray = theme.obtainStyledAttributes(new int[]{
-                    R.attr.colorPrimary,
-                    R.attr.colorPrimaryDark,
-                    R.attr.textColorPrimary,
-            });
-            final int iconColor = typedArray.getColor(2,
-                    ContextCompat.getColor(wrapper, R.color.text_color_primary));
-            final int statusBarColor = typedArray.getColor(1,
+            int[] attrs;
+            try {
+                final Field field = android.R.attr.class.getDeclaredField("statusBarColor");
+                final int attr = field.getInt(null);
+                attrs = new int[] {
+                        attr,
+                        R.attr.textColorPrimary,
+                };
+            } catch (Throwable e) {
+                attrs = new int[] {
+                        R.attr.colorPrimaryDark,
+                        R.attr.textColorPrimary
+                };
+            }
+            final TypedArray typedArray = theme.obtainStyledAttributes(attrs);
+            final int statusBarColor = typedArray.getColor(typedArray.getIndex(0),
                     ContextCompat.getColor(wrapper, R.color.primary_color_dark));
+            final int iconColor = typedArray.getColor(typedArray.getIndex(1),
+                    ContextCompat.getColor(wrapper, R.color.text_color_primary));
             typedArray.recycle();
             overflowMenuIcon.getDrawable().setColorFilter(iconColor, PorterDuff.Mode.SRC_ATOP);
             updateToolbarContainer(activity, preferenceManager.isBackgroundImageEnabled());
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index f49f71cce..377562362 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -30,6 +30,13 @@
         -->
     </style>
 
+    <style name="Theme.LightTheme.Incognito" parent="Theme.LightTheme">
+        <item name="colorPrimary">@color/incognito_tab_primary_color</item>
+        <item name="colorPrimaryDark">@color/incognito_tab_primary_color_dark</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:statusBarColor">@color/primary_color</item>
+    </style>
+
     <style name="Theme.SettingsTheme" parent="Theme.AppCompat.Light">
         <item name="toolbarSettingsBackground">@drawable/toolbar_elevate</item>
         <item name="listBackground">@drawable/list_bg</item>
@@ -40,7 +47,11 @@
         <item name="windowActionBar">false</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="dividerColor">@color/divider_light</item>
-        <item name="android:statusBarColor">@color/accent_color</item>
+        <item name="android:statusBarColor">@color/primary_color</item>
     </style>
 
+    <style name="Theme.Purchase.Dialog" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="windowNoTitle">true</item>
+        <item name="android:statusBarColor">@color/primary_color</item>
+    </style>
 </resources>
\ No newline at end of file

From dfa925dd12bb1286b62351079087ddd602673d3f Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Thu, 27 Jun 2019 18:58:27 +0200
Subject: [PATCH 04/57] AP-337 re-add option menu in overview (#132)

---
 .../browser/overview/OverviewFragment.java    | 108 +++++-------------
 .../browser/overview/OverviewFragment.java    |   8 +-
 .../browser/main/MainActivityComponent.java   |   4 +-
 .../overview/CommonOverviewFragment.java      |  80 +++++++++++++
 .../browser/overview/TabOverviewFragment.java |  15 ++-
 5 files changed, 116 insertions(+), 99 deletions(-)
 create mode 100644 app/src/main/java/com/cliqz/browser/overview/CommonOverviewFragment.java

diff --git a/app/src/cliqz/java/com/cliqz/browser/overview/OverviewFragment.java b/app/src/cliqz/java/com/cliqz/browser/overview/OverviewFragment.java
index dfec65467..bd4e3144e 100644
--- a/app/src/cliqz/java/com/cliqz/browser/overview/OverviewFragment.java
+++ b/app/src/cliqz/java/com/cliqz/browser/overview/OverviewFragment.java
@@ -1,49 +1,34 @@
 package com.cliqz.browser.overview;
 
+import android.app.Activity;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import com.google.android.material.tabs.TabLayout;
-import androidx.fragment.app.Fragment;
-import androidx.core.content.ContextCompat;
-import androidx.viewpager.widget.ViewPager;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.viewpager.widget.ViewPager;
+
 import com.cliqz.browser.R;
-import com.cliqz.browser.app.BrowserApp;
-import com.cliqz.browser.main.FlavoredActivityComponent;
 import com.cliqz.browser.main.Messages;
 import com.cliqz.browser.main.TabFragment;
-import com.cliqz.browser.main.TabsManager;
-import com.cliqz.browser.telemetry.Telemetry;
 import com.cliqz.browser.telemetry.TelemetryKeys;
 import com.cliqz.browser.webview.CliqzMessages;
-import com.cliqz.nove.Bus;
 import com.cliqz.nove.Subscribe;
+import com.google.android.material.tabs.TabLayout;
 import com.readystatesoftware.systembartint.SystemBarTintManager;
 
-import javax.inject.Inject;
-
-public class OverviewFragment extends Fragment {
-
-    @Inject
-    Bus bus;
-
-    @Inject
-    TabsManager tabsManager;
+import java.util.Objects;
 
-    @Inject
-    Telemetry telemetry;
+public class OverviewFragment extends CommonOverviewFragment {
 
     private ViewPager mViewPager;
     private OverviewTabsEnum mSelectedTab = OverviewTabsEnum.UNDEFINED;
@@ -62,15 +47,16 @@ public View onCreateView(@NonNull LayoutInflater inflater, final ViewGroup conta
         final View deleteButton = view.findViewById(R.id.action_delete);
         deleteButton.setOnClickListener(v -> bus.post(new Messages.OnContextualBarDeletePressed()));
         final int themeResId = R.style.Theme_Cliqz_Overview;
-        final TypedArray typedArray = getActivity().getTheme()
+        final Activity activity = Objects.requireNonNull(getActivity());
+        final TypedArray typedArray = activity.getTheme()
                 .obtainStyledAttributes(themeResId, new int[]{R.attr.colorPrimaryDark});
         final int resourceId = typedArray.getResourceId(0, R.color.normal_tab_primary_color);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            getActivity().getWindow()
-                    .setStatusBarColor(ContextCompat.getColor(getContext(), resourceId));
+            activity.getWindow()
+                    .setStatusBarColor(ContextCompat.getColor(activity, resourceId));
             typedArray.recycle();
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            SystemBarTintManager tintManager = new SystemBarTintManager(getActivity());
+            SystemBarTintManager tintManager = new SystemBarTintManager(activity);
             tintManager.setStatusBarTintEnabled(true);
             tintManager.setNavigationBarTintEnabled(true);
             tintManager.setTintColor(resourceId);
@@ -81,14 +67,13 @@ public View onCreateView(@NonNull LayoutInflater inflater, final ViewGroup conta
         mViewPager.setOffscreenPageLimit(5);
         mViewPager.setAdapter(mPageAdapter);
         final Toolbar toolbar = view.findViewById(R.id.toolbar);
-        toolbar.setTitle(getContext().getString(R.string.overview));
-        ((AppCompatActivity) getActivity()).setSupportActionBar(toolbar);
-        final ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar();
+        toolbar.setTitle(activity.getString(R.string.overview));
+        ((AppCompatActivity) activity).setSupportActionBar(toolbar);
+        final ActionBar actionBar = ((AppCompatActivity) activity).getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setTitle(getContext().getString(R.string.overview));
+            actionBar.setTitle(activity.getString(R.string.overview));
         }
-        setHasOptionsMenu(true);
         TabLayout tabLayout = view.findViewById(R.id.tabs);
         tabLayout.setupWithViewPager(mViewPager);
         return view;
@@ -104,43 +89,6 @@ private void sendCurrentPageHideSignal() {
         }
     }
 
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.fragment_overview_menu, menu);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // All the options close the current visible page
-        sendCurrentPageHideSignal();
-        final int id = item.getItemId();
-        switch (id) {
-            case R.id.action_new_tab:
-                telemetry.sendMainMenuSignal(TelemetryKeys.NEW_TAB, false, TelemetryKeys.OVERVIEW);
-                tabsManager.buildTab().show();
-                return true;
-            case R.id.action_new_forget_tab:
-                telemetry.sendMainMenuSignal(TelemetryKeys.NEW_FORGET_TAB, false,
-                        TelemetryKeys.OVERVIEW);
-                tabsManager.buildTab().setForgetMode(true).show();
-                return true;
-            case R.id.action_settings:
-                telemetry.sendMainMenuSignal(TelemetryKeys.SETTINGS, false, TelemetryKeys.OVERVIEW);
-                if (bus != null) {
-                    bus.post(new Messages.GoToSettings());
-                }
-                return true;
-            case R.id.action_close_all_tabs:
-                telemetry.sendMainMenuSignal(TelemetryKeys.CLOSE_ALL_TABS, false,
-                        TelemetryKeys.OVERVIEW);
-                tabsManager.deleteAllTabs();
-                return true;
-            default:
-                return false;
-        }
-    }
-
     @SuppressWarnings("UnusedParameters")
     @Subscribe
     public void onBackPressed(Messages.BackPressed event) {
@@ -176,16 +124,6 @@ public void onOrientationChanged(Configuration newConfig) {
         TelemetryKeys.LANDSCAPE : TelemetryKeys.PORTRAIT, TelemetryKeys.OVERVIEW);
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        final FlavoredActivityComponent component = BrowserApp.getActivityComponent(getActivity());
-        if (component != null) {
-            component.inject(this);
-            bus.register(this);
-        }
-    }
-
     @Override
     public void onStop() {
         super.onStop();
@@ -270,4 +208,10 @@ public void onPageScrollStateChanged(int state) {
 
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        sendCurrentPageHideSignal();
+        return super.onOptionsItemSelected(item);
+    }
 }
diff --git a/app/src/lumen/java/com/cliqz/browser/overview/OverviewFragment.java b/app/src/lumen/java/com/cliqz/browser/overview/OverviewFragment.java
index 3a7e1ede0..1342f37c3 100644
--- a/app/src/lumen/java/com/cliqz/browser/overview/OverviewFragment.java
+++ b/app/src/lumen/java/com/cliqz/browser/overview/OverviewFragment.java
@@ -24,16 +24,10 @@
 
 import javax.inject.Inject;
 
-public class OverviewFragment extends Fragment {
+public class OverviewFragment extends CommonOverviewFragment {
 
     private final static String TAB_OVERVIEW_TAG = "tab_overview_tag";
 
-    @Inject
-    TabsManager tabsManager;
-
-    @Inject
-    Bus bus;
-
     public void setDisplayFavorites() {
 
     }
diff --git a/app/src/main/java/com/cliqz/browser/main/MainActivityComponent.java b/app/src/main/java/com/cliqz/browser/main/MainActivityComponent.java
index 3eb8de8aa..4810e3185 100644
--- a/app/src/main/java/com/cliqz/browser/main/MainActivityComponent.java
+++ b/app/src/main/java/com/cliqz/browser/main/MainActivityComponent.java
@@ -2,7 +2,7 @@
 
 import com.cliqz.browser.main.search.Incognito;
 import com.cliqz.browser.main.search.SearchView;
-import com.cliqz.browser.overview.OverviewFragment;
+import com.cliqz.browser.overview.CommonOverviewFragment;
 import com.cliqz.browser.overview.TabOverviewFragment;
 import com.cliqz.browser.utils.PasswordManager;
 import com.cliqz.browser.webview.BaseWebView;
@@ -31,7 +31,7 @@ interface MainActivityComponent {
 
     void inject(CliqzWebView cliqzWebView);
 
-    void inject(OverviewFragment overviewFragment);
+    void inject(CommonOverviewFragment overviewFragment);
 
     void inject(TabOverviewFragment tabOverviewFragment);
 
diff --git a/app/src/main/java/com/cliqz/browser/overview/CommonOverviewFragment.java b/app/src/main/java/com/cliqz/browser/overview/CommonOverviewFragment.java
new file mode 100644
index 000000000..6364abe71
--- /dev/null
+++ b/app/src/main/java/com/cliqz/browser/overview/CommonOverviewFragment.java
@@ -0,0 +1,80 @@
+package com.cliqz.browser.overview;
+
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import androidx.fragment.app.Fragment;
+
+import com.cliqz.browser.R;
+import com.cliqz.browser.app.BrowserApp;
+import com.cliqz.browser.main.FlavoredActivityComponent;
+import com.cliqz.browser.main.Messages;
+import com.cliqz.browser.main.TabsManager;
+import com.cliqz.browser.telemetry.Telemetry;
+import com.cliqz.browser.telemetry.TelemetryKeys;
+import com.cliqz.nove.Bus;
+
+import javax.inject.Inject;
+
+public class CommonOverviewFragment extends Fragment {
+
+    @Inject
+    Bus bus;
+
+    @Inject
+    TabsManager tabsManager;
+
+    @Inject
+    Telemetry telemetry;
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        final FlavoredActivityComponent component = BrowserApp.getActivityComponent(getActivity());
+        if (component != null) {
+            component.inject(this);
+            bus.register(this);
+        }
+    }
+
+    public CommonOverviewFragment() {
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.fragment_overview_menu, menu);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // All the options close the current visible page
+        final int id = item.getItemId();
+        switch (id) {
+            case R.id.action_new_tab:
+                telemetry.sendMainMenuSignal(TelemetryKeys.NEW_TAB, false, TelemetryKeys.OVERVIEW);
+                tabsManager.buildTab().show();
+                return true;
+            case R.id.action_new_forget_tab:
+                telemetry.sendMainMenuSignal(TelemetryKeys.NEW_FORGET_TAB, false,
+                        TelemetryKeys.OVERVIEW);
+                tabsManager.buildTab().setForgetMode(true).show();
+                return true;
+            case R.id.action_settings:
+                telemetry.sendMainMenuSignal(TelemetryKeys.SETTINGS, false, TelemetryKeys.OVERVIEW);
+                if (bus != null) {
+                    bus.post(new Messages.GoToSettings());
+                }
+                return true;
+            case R.id.action_close_all_tabs:
+                telemetry.sendMainMenuSignal(TelemetryKeys.CLOSE_ALL_TABS, false,
+                        TelemetryKeys.OVERVIEW);
+                tabsManager.deleteAllTabs();
+                return true;
+            default:
+                return false;
+        }
+    }
+}
diff --git a/app/src/main/java/com/cliqz/browser/overview/TabOverviewFragment.java b/app/src/main/java/com/cliqz/browser/overview/TabOverviewFragment.java
index 33839a092..13fb6f2cb 100644
--- a/app/src/main/java/com/cliqz/browser/overview/TabOverviewFragment.java
+++ b/app/src/main/java/com/cliqz/browser/overview/TabOverviewFragment.java
@@ -19,6 +19,8 @@
 import com.cliqz.deckview.TabsDeckView;
 import com.cliqz.jsengine.Engine;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
 
 import javax.inject.Inject;
@@ -55,16 +57,13 @@ public class TabOverviewFragment extends Fragment implements TabsDeckView.TabsDe
 
     @Nullable
     @Override
-    public View onCreateView(final LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(@NotNull final LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.tabs_overview, container, false);
         ButterKnife.bind(this, view);
-        floatingActionButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                telemetry.sendNewTabSignal(tabsManager.getTabCount()+1);
-                final int position = tabsManager.buildTab().create();
-                tabsManager.showTab(position, R.anim.new_tab_scale_animation);
-            }
+        floatingActionButton.setOnClickListener(v -> {
+            telemetry.sendNewTabSignal(tabsManager.getTabCount()+1);
+            final int position = tabsManager.buildTab().create();
+            tabsManager.showTab(position, R.anim.new_tab_scale_animation);
         });
         deckView.setListener(this);
         return view;

From 4b356b663d0973c9a85cfdba7e64dfef5e7189bc Mon Sep 17 00:00:00 2001
From: Jayesh Solanki <jayeshsolanki93@gmail.com>
Date: Fri, 28 Jun 2019 15:04:41 +0200
Subject: [PATCH 05/57] AP-349 Check and restore subscription if exists for
 each purchase request (#131)

---
 .../browser/purchases/PurchaseFragment.kt     | 95 ++++++++++++-------
 .../browser/purchases/PurchasesManager.kt     |  5 +-
 .../browser/starttab/freshtab/FreshTab.kt     |  1 +
 .../lumen/res/layout/fragment_freshtab.xml    |  2 +-
 4 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
index a362c9427..aa3769fdb 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
@@ -118,44 +118,75 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
     }
 
     override fun onBuyClicked(position: Int) {
+        mAdapter.getProduct(position)?.apply {
+            restoreExistingPurchase({ activeSku ->
+                Toast.makeText(context, "You are already subscribed to one the packages", Toast.LENGTH_LONG).show()
+                enableFeatures(activeSku)
+            }, {
+                makePurchase(sku)
+            })
+        }
+    }
+
+    private fun restoreExistingPurchase(success: (sku: String) -> Unit, cannotRestore: () -> Unit) {
+        Purchases.sharedInstance.restorePurchasesWith(
+                {
+                    Log.w(TAG, it.message)
+                    cannotRestore()
+                },
+                {
+                    if (it.activeSubscriptions.isEmpty()) {
+                        cannotRestore()
+                    } else {
+                        success(it.activeSubscriptions.first())
+                    }
+                }
+        )
+    }
+
+    private fun makePurchase(sku: String) {
         val oldSku = ArrayList<String>()
         if (purchasesManager.purchase.sku.isNotEmpty()) {
             oldSku.add(purchasesManager.purchase.sku)
         }
-        mAdapter.getProduct(position)?.apply {
-            Purchases.sharedInstance.makePurchaseWith(activity as Activity, sku,
-                    BillingClient.SkuType.SUBS, oldSku,
-                    { error, _ ->
-                        Log.e(TAG, error.underlyingErrorMessage)
+        Purchases.sharedInstance.makePurchaseWith(activity as Activity, sku,
+                BillingClient.SkuType.SUBS, oldSku,
+                { error, userCancelled ->
+                    if (!userCancelled) {
+                        Log.e(TAG, "${error.underlyingErrorMessage}")
                         Toast.makeText(context, error.message, Toast.LENGTH_LONG).show()
-                    },
-                    { purchase, _ ->
-                        when (purchase.sku) {
-                            Product.BASIC_VPN -> {
-                                purchasesManager.purchase.isVpnEnabled = true
-                                purchasesManager.purchase.isDashboardEnabled = true
-                                preferenceManager.isAttrackEnabled = true
-                                preferenceManager.adBlockEnabled = true
-                            }
-                            Product.BASIC -> {
-                                purchasesManager.purchase.isVpnEnabled = false
-                                purchasesManager.purchase.isDashboardEnabled = true
-                                preferenceManager.isAttrackEnabled = true
-                                preferenceManager.adBlockEnabled = true
-                            }
-                            Product.VPN -> {
-                                purchasesManager.purchase.isVpnEnabled = true
-                                purchasesManager.purchase.isDashboardEnabled = false
-                                preferenceManager.isAttrackEnabled = false
-                                preferenceManager.adBlockEnabled = false
-                            }
-                        }
-                        purchasesManager.purchase.sku = purchase.sku
-                        purchasesManager.purchase.isASubscriber = true
-                        bus.post(Messages.PurchaseCompleted())
-                        this@PurchaseFragment.dismiss()
                     }
-            )
+                },
+                { purchase, _ ->
+                    enableFeatures(purchase.sku)
+                }
+        )
+    }
+
+    private fun enableFeatures(sku: String) {
+        when (sku) {
+            Product.BASIC_VPN -> {
+                purchasesManager.purchase.isVpnEnabled = true
+                purchasesManager.purchase.isDashboardEnabled = true
+                preferenceManager.isAttrackEnabled = true
+                preferenceManager.adBlockEnabled = true
+            }
+            Product.BASIC -> {
+                purchasesManager.purchase.isVpnEnabled = false
+                purchasesManager.purchase.isDashboardEnabled = true
+                preferenceManager.isAttrackEnabled = true
+                preferenceManager.adBlockEnabled = true
+            }
+            Product.VPN -> {
+                purchasesManager.purchase.isVpnEnabled = true
+                purchasesManager.purchase.isDashboardEnabled = false
+                preferenceManager.isAttrackEnabled = false
+                preferenceManager.adBlockEnabled = false
+            }
         }
+        purchasesManager.purchase.sku = sku
+        purchasesManager.purchase.isASubscriber = true
+        bus.post(Messages.PurchaseCompleted())
+        this@PurchaseFragment.dismiss()
     }
 }
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
index 484be83c7..addcf73e7 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
@@ -62,10 +62,9 @@ class PurchasesManager(
             isLoading = false
         } else {
             purchase.isASubscriber = false
-            // Check if in trial period.
-            this.loadTrialPeriodInfo(this@PurchasesManager)
         }
-
+        // Get Trial Period data and vpn username, password.
+        this.loadTrialPeriodInfo(this@PurchasesManager)
     }
 
     override fun onError(error: PurchasesError) {
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/freshtab/FreshTab.kt b/app/src/lumen/java/com/cliqz/browser/starttab/freshtab/FreshTab.kt
index 9d7329e8b..f34ce0e90 100644
--- a/app/src/lumen/java/com/cliqz/browser/starttab/freshtab/FreshTab.kt
+++ b/app/src/lumen/java/com/cliqz/browser/starttab/freshtab/FreshTab.kt
@@ -93,6 +93,7 @@ internal class FreshTab : StartTabFragment() {
 
     @Subscribe
     fun getTrialPeriod(onTrialPeriodResponse: Messages.OnTrialPeriodResponse) {
+        if (purchasesManager.purchase.isASubscriber) return
         if (purchasesManager.serverData != null) {
             purchasesManager.serverData?.apply {
                 if (isInTrial) {
diff --git a/app/src/lumen/res/layout/fragment_freshtab.xml b/app/src/lumen/res/layout/fragment_freshtab.xml
index 2a000828f..c2aa1ae53 100644
--- a/app/src/lumen/res/layout/fragment_freshtab.xml
+++ b/app/src/lumen/res/layout/fragment_freshtab.xml
@@ -11,7 +11,7 @@
         layout="@layout/fragment_freshtab_welcome_msg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/trial_over_lumen_upgrade"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"

From 3a4d03a63ffe7f7fa069d5570dde7073582dbe05 Mon Sep 17 00:00:00 2001
From: Jayesh Solanki <jayeshsolanki93@gmail.com>
Date: Fri, 28 Jun 2019 16:09:08 +0200
Subject: [PATCH 06/57] Handle null VpnProfile crash (#133)

---
 .../java/com/cliqz/browser/vpn/VpnPanel.java  | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
index 8f180a8ce..2d92b9c8c 100644
--- a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
+++ b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
@@ -9,7 +9,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -36,6 +35,7 @@
 import com.cliqz.nove.Subscribe;
 
 import java.util.ArrayList;
+import java.util.Collection;
 
 import javax.inject.Inject;
 
@@ -112,7 +112,11 @@ public static VpnPanel create(View source) {
         final Bundle arguments = new Bundle();
         arguments.putInt(KEY_ANCHOR_HEIGHT, source.getHeight());
         dialog.setArguments(arguments);
-        dialog.selectedProfile = ProfileManager.getInstance(source.getContext()).getProfiles().iterator().next();
+        final Collection<VpnProfile> vpnProfiles =
+                ProfileManager.getInstance(source.getContext()).getProfiles();
+        if (vpnProfiles != null && !vpnProfiles.isEmpty()) {
+            dialog.selectedProfile = vpnProfiles.iterator().next();
+        }
         return dialog;
     }
 
@@ -164,7 +168,11 @@ public void onPause() {
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         ButterKnife.bind(this, view);
-        mSelectedCountry.setText(selectedProfile.getName());
+        if (selectedProfile == null) {
+            mSelectedCountry.setText("US");
+        } else {
+            mSelectedCountry.setText(selectedProfile.getName());
+        }
         mSelectedCountry.setPaintFlags(mSelectedCountry.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
 
         vpnMsgsChangeDrawable(VpnStatus.isVPNConnected() ? R.drawable.ic_check : R.drawable.ic_cross);
@@ -184,7 +192,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 
     @OnClick(R.id.vpn_country)
     void vpnCountryClicked() {
-        showVpnCountriesDialog();
+        if (selectedProfile != null) {
+            showVpnCountriesDialog();
+        } else {
+            unlockVpnDialog();
+        }
     }
 
     @OnClick(R.id.vpn_connect_button)

From c231091aff19513359b0be87348431bae24bd656 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Mon, 1 Jul 2019 17:28:03 +0200
Subject: [PATCH 07/57] AP-331 removes incognito mode special message from
 Lumen (#137)

---
 .../com/cliqz/browser/main/TabFragment.java   |  9 +---
 .../cliqz/browser/main/search/SearchView.java | 51 ++++++++-----------
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/com/cliqz/browser/main/TabFragment.java b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
index f14743a49..c15ac7c67 100644
--- a/app/src/main/java/com/cliqz/browser/main/TabFragment.java
+++ b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
@@ -88,11 +88,6 @@
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
 import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 
 import javax.inject.Inject;
 
@@ -1011,9 +1006,7 @@ public void reloadPage(Messages.ReloadPage event) {
 
     @Subscribe
     public void shareLink(Messages.ShareLink event) {
-        if (state.getMode() == Mode.SEARCH) {
-            searchView.requestCardUrl();
-        } else {
+        if (state.getMode() != Mode.SEARCH) {
             final String url = mLightningView.getUrl();
             shareText(url);
             telemetry.sendShareSignal(TelemetryKeys.WEB);
diff --git a/app/src/main/java/com/cliqz/browser/main/search/SearchView.java b/app/src/main/java/com/cliqz/browser/main/search/SearchView.java
index d88a5f9f4..708c05aa4 100644
--- a/app/src/main/java/com/cliqz/browser/main/search/SearchView.java
+++ b/app/src/main/java/com/cliqz/browser/main/search/SearchView.java
@@ -79,7 +79,7 @@ public SearchView(AppCompatActivity context, Engine engine) {
         mReactView = engine.reactRootView;
         startTabContainer = new StartTabContainer(this.context);
         startTabContainer.init(context.getSupportFragmentManager(), preferenceManager);
-        incognito = new Incognito(this.context);
+        incognito = BuildConfig.IS_NOT_LUMEN ? new Incognito(this.context) : null;
         // mReactView.setBackgroundColor(ContextCompat.getColor(this.context, R.color.normal_tab_primary_color));
         mReactView.setLayoutParams(
                 new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
@@ -88,7 +88,10 @@ public SearchView(AppCompatActivity context, Engine engine) {
             parent.removeView(mReactView);
         }
         addView(mReactView);
-        addView(incognito);
+        if (incognito != null) {
+            incognito.setVisibility(GONE);
+            addView(incognito);
+        }
         addView(startTabContainer);
     }
 
@@ -97,15 +100,7 @@ public void bringToFront() {
         super.bringToFront();
         final String query = state.getQuery();
         if (query.equals("")) {
-            if (state.isIncognito()) {
-                incognito.bringToFront();
-                incognito.setVisibility(View.VISIBLE);
-                startTabContainer.setVisibility(View.GONE);
-            } else {
-                startTabContainer.bringToFront();
-                startTabContainer.setVisibility(View.VISIBLE);
-                incognito.setVisibility(View.GONE);
-            }
+            setIncognito(state.isIncognito());
             mReactView.setVisibility(View.GONE);
         } else {
             mReactView.bringToFront();
@@ -157,30 +152,28 @@ public void onResume() {
 
     public void setCurrentTabState(CliqzBrowserState state) {
         this.state = state;
-//        mReactView.setCurrentTabState(state);
-        if (state.isIncognito()) {
-            if (incognito.getVisibility() == VISIBLE) {
-                return;
-            }
+        setIncognito(state.isIncognito());
+    }
+
+    private void setIncognito(boolean enabled) {
+        final boolean shouldShowIncognitoView = enabled && incognito != null && incognito.getVisibility() != VISIBLE;
+        final boolean shouldShowRegularView = !enabled && startTabContainer.getVisibility() != VISIBLE;
+
+        if (shouldShowIncognitoView) {
             incognito.bringToFront();
-            incognito.setVisibility(View.VISIBLE);
-            startTabContainer.setVisibility(View.GONE);
-        } else {
-            if (startTabContainer.getVisibility() == VISIBLE) {
-                return;
-            }
+            incognito.setVisibility(VISIBLE);
+            startTabContainer.setVisibility(GONE);
+        }
+        if (shouldShowRegularView) {
             startTabContainer.bringToFront();
-            startTabContainer.setVisibility(View.VISIBLE);
-            incognito.setVisibility(View.GONE);
+            startTabContainer.setVisibility(VISIBLE);
+            if (incognito != null) {
+                incognito.setVisibility(GONE);
+            }
         }
     }
 
-    public void requestCardUrl() {
-//        cardsView.requestCardUrl();
-    }
-
     public void updateQuery(String query, int start, int count) {
-        //noinspection ConstantConditions
         if (BuildConfig.IS_LUMEN) {
             return;
         }

From bb0316b5590f602e09c88f921cc0bbc94b41f13f Mon Sep 17 00:00:00 2001
From: Jayesh Solanki <jayeshsolanki93@gmail.com>
Date: Tue, 2 Jul 2019 18:22:09 +0200
Subject: [PATCH 08/57] Do not change user preferences when disabling
 subscriptions (#136)

---
 .../cliqz/browser/controlcenter/ControlCenterDialog.java | 8 +++-----
 .../cliqz/browser/controlcenter/DashboardFragment.java   | 6 ++++--
 .../java/com/cliqz/browser/purchases/PurchaseFragment.kt | 9 +++++++--
 .../java/com/cliqz/browser/purchases/PurchasesManager.kt | 6 ------
 .../browser/lightning/preference/PreferenceManager.java  | 6 ++----
 .../java/acr/browser/lightning/view/LightningView.java   | 8 ++++++--
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
index eadaf01c0..11e2761f4 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
@@ -145,10 +145,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         controlCenterPager.setAdapter(mControlCenterPagerAdapter);
         controlCenterTabLayout.setupWithViewPager(controlCenterPager);
 
-        boolean isDashboardEnabled =
-                preferenceManager.isAttrackEnabled() && preferenceManager.getAdBlockEnabled();
-
-        hideSubscribeButton(isDashboardEnabled);
+        hideSubscribeButton(purchasesManager.isDashboardEnabled());
 
         ultimateProtectionSwitch.setOnCheckedChangeListener((compoundButton, isChecked) -> {
             mControlCenterPagerAdapter.updateViewComponent(0, isChecked);
@@ -191,7 +188,8 @@ public void onConfigurationChanged(Configuration newConfig) {
     }
 
     private void hideSubscribeButton(boolean isDashboardEnabled) {
-        ultimateProtectionSwitch.setChecked(isDashboardEnabled);
+        ultimateProtectionSwitch.setChecked(preferenceManager.isAttrackEnabled() &&
+                preferenceManager.getAdBlockEnabled());
         subscribeUltimateProtectionView.setVisibility(isDashboardEnabled ? View.GONE : View.VISIBLE);
         dashboardDisableOverlay.setVisibility(isDashboardEnabled ? View.GONE : View.VISIBLE);
         ViewExtensionsKt.enableViewHierarchy(ultimateProtectionContainer, isDashboardEnabled);
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.java
index 478f3b98a..561ed4bd4 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.java
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.java
@@ -80,7 +80,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         updateUI();
         dashBoardListView.setAdapter(mDashboardAdapter);
         dashBoardListView.setLayoutManager(new LinearLayoutManager(getContext()));
-        changeDashboardState(preferenceManager.isAttrackEnabled() && preferenceManager.getAdBlockEnabled());
+        changeDashboardState(purchasesManager.isDashboardEnabled() &&
+                preferenceManager.isAttrackEnabled() && preferenceManager.getAdBlockEnabled());
         return view;
     }
 
@@ -135,7 +136,8 @@ public void updateViews(ReadableMap data) {
         final MeasurementWrapper trackersDetected;
         final MeasurementWrapper pagesVisited;
 
-        if (preferenceManager.getAdBlockEnabled() && preferenceManager.isAttrackEnabled()) {
+        if (purchasesManager.isDashboardEnabled() &&
+                preferenceManager.getAdBlockEnabled() && preferenceManager.isAttrackEnabled()) {
             dataSaved = ValuesFormatterUtil.formatBytesCount(ReadableMapUtils.getSafeInt(data, "dataSaved"));
             adsBlocked = ValuesFormatterUtil.formatBlockCount(ReadableMapUtils.getSafeInt(data,"adsBlocked"));
             trackersDetected = ValuesFormatterUtil.formatBlockCount(ReadableMapUtils.getSafeInt(data, "trackersDetected"));
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
index aa3769fdb..4856b0f17 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
@@ -120,8 +120,13 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
     override fun onBuyClicked(position: Int) {
         mAdapter.getProduct(position)?.apply {
             restoreExistingPurchase({ activeSku ->
-                Toast.makeText(context, "You are already subscribed to one the packages", Toast.LENGTH_LONG).show()
-                enableFeatures(activeSku)
+                if (activeSku == sku) {
+                    Toast.makeText(context, "You are already subscribed to this package", Toast.LENGTH_LONG).show()
+                    // TODO: Can remove this line and provide a restore button.
+                    enableFeatures(sku)
+                } else {
+                    makePurchase(sku)
+                }
             }, {
                 makePurchase(sku)
             })
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
index addcf73e7..3a54a24df 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
@@ -36,8 +36,6 @@ class PurchasesManager(
     override fun onTrialPeriodResponse(serverData: ServerData?) {
         this.serverData = serverData
         isLoading = false
-        preferenceManager.adBlockEnabled = serverData == null || serverData.isInTrial
-        preferenceManager.isAttrackEnabled = serverData == null || serverData.isInTrial
 
         bus.post(Messages.OnTrialPeriodResponse())
     }
@@ -54,10 +52,6 @@ class PurchasesManager(
                     this.isDashboardEnabled = isDashboardEnabled
                     this.sku = sku
                 }
-                if (!isDashboardEnabled) {
-                    preferenceManager.adBlockEnabled = false
-                    preferenceManager.isAttrackEnabled = false
-                }
             }
             isLoading = false
         } else {
diff --git a/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java b/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java
index 81d086494..9c57c5620 100644
--- a/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java
+++ b/app/src/main/java/acr/browser/lightning/preference/PreferenceManager.java
@@ -153,8 +153,7 @@ public PreferenceManager(final Context context) {
      * @return true if adblocking is enabled, false otherwise
      */
     public boolean getAdBlockEnabled() {
-        boolean isDefaultEnabled = BuildConfig.IS_NOT_LUMEN;
-        return mPrefs.getBoolean(Name.BLOCK_ADS, isDefaultEnabled);
+        return mPrefs.getBoolean(Name.BLOCK_ADS, true);
     }
 
     public boolean getOptimizedAdBlockEnabled() {
@@ -446,8 +445,7 @@ public boolean getFirstDevicePaired() {
     }
 
     public boolean isAttrackEnabled() {
-        boolean isDefaultEnabled = BuildConfig.IS_NOT_LUMEN;
-        return mPrefs.getBoolean(Name.ATTRACK_ENABLED, isDefaultEnabled);
+        return mPrefs.getBoolean(Name.ATTRACK_ENABLED, true);
     }
 
     public int getMainActivityLastState() {
diff --git a/app/src/main/java/acr/browser/lightning/view/LightningView.java b/app/src/main/java/acr/browser/lightning/view/LightningView.java
index 0d6fb223a..68035bdd8 100644
--- a/app/src/main/java/acr/browser/lightning/view/LightningView.java
+++ b/app/src/main/java/acr/browser/lightning/view/LightningView.java
@@ -27,6 +27,7 @@
 import com.cliqz.browser.antiphishing.AntiPhishing;
 import com.cliqz.browser.app.BrowserApp;
 import com.cliqz.browser.main.FlavoredActivityComponent;
+import com.cliqz.browser.purchases.PurchasesManager;
 import com.cliqz.browser.telemetry.Telemetry;
 import com.cliqz.browser.utils.BloomFilterUtils;
 import com.cliqz.browser.utils.PasswordManager;
@@ -117,6 +118,9 @@ public interface LightingViewListener {
     @Inject
     PreferenceManager preferences;
 
+    @Inject
+    PurchasesManager purchasesManager;
+
     @Inject
     LightningDialogBuilder dialogBuilder;
 
@@ -275,8 +279,8 @@ private synchronized void initializePreferences(@Nullable WebSettings settings)
 
         // update jsengine module states.
         try {
-            attrack.setEnabled(preferences.isAttrackEnabled());
-            adblocker.setEnabled(preferences.getAdBlockEnabled());
+            attrack.setEnabled(purchasesManager.isDashboardEnabled() && preferences.isAttrackEnabled());
+            adblocker.setEnabled(purchasesManager.isDashboardEnabled() && preferences.getAdBlockEnabled());
         } catch (EngineNotYetAvailable e) {
             Log.w(TAG, "error updating jsengine state", e);
         }

From 361355dcbf89ab6aa8a4e333c44d7f19e652f1e5 Mon Sep 17 00:00:00 2001
From: Sharath <sharath@cliqz.com>
Date: Tue, 2 Jul 2019 18:55:39 +0200
Subject: [PATCH 09/57] Fix Docker and Setup CD (#135)

---
 Dockerfile                                    |  37 +++---
 Jenkinsfile.upload                            | 107 ++++++++++--------
 app/build.gradle                              |   2 +-
 .../main/java/com/cliqz/gradle/CliqzPlugin.kt |  10 +-
 fastlane/Appfile                              |   2 +-
 fastlane/Fastfile                             |  19 +++-
 6 files changed, 101 insertions(+), 76 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9269d52b7..d533dd81b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 MAINTAINER Stefano Pacifici <stefano@cliqz.com>
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -61,7 +61,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
 ENV ANDROID_HOME /home/jenkins/android_home
 ENV GRADLE_USER_HOME /home/jenkins/gradle_home
 ENV NVM_DIR /home/jenkins/nvm 
-ENV NODE_VERSION 8.9.3
+ENV NODE_VERSION 9.11.2
 
 USER jenkins
 
@@ -74,18 +74,14 @@ RUN mkdir -p $ANDROID_HOME; \
     rm -r sdktools.zip; \
     (while (true); do echo y; sleep 2; done) | \
         tools/bin/sdkmanager  \
-        "build-tools;26.0.2" \
-        "platforms;android-23" \
-        "platforms;android-27" \
+        "build-tools;28.0.3" \
+        "platforms;android-28" \
         "platform-tools" \
         "tools" \
-        "platforms;android-25" \
         "extras;google;m2repository" \
         "extras;android;m2repository" \
         "extras;google;google_play_services";
 
-ENV LD_LIBRARY_PATH "/home/jenkins/android_home/emulator/lib64/qt/lib"
-
 # Install Node.JS
 SHELL ["/bin/bash", "-l", "-c"]
 RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash && \
@@ -93,14 +89,23 @@ RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | b
 
 ENV PATH "$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH"
 
-#Installation of 'yarn'; 'appium' & 'wd' for Integration Tests
-RUN npm install --global \
-    yarn \
-    appium \
-    wd
+#Installation of Updated 'npm'
+RUN npm install --global npm
 
 #Install Ruby and Fastlane
+RUN for key in 409B6B1796C275462A1703113804BB82D39DC0E3 \
+               7D2BAF1CF37B13E2069D6956105BD0E739499BDB; do \
+        for server in "hkp://keys.gnupg.net" \
+                         "hkp://p80.pool.sks-keyservers.net:80" \
+                         "pgp.mit.edu" \
+                         "hkp://keyserver.ubuntu.com:80"; do \
+            gpg2 --keyserver "${server}" --recv-keys "${key}" || echo "Trying new server..."; \
+        done; \
+    done
+RUN curl -sSL https://get.rvm.io | bash -s stable --ruby=2.4.3 --autolibs=read-fail && \
+    source /home/jenkins/.rvm/scripts/rvm \
+    rvm reload && \
+    gem install fastlane --version 2.126.0
 
-RUN gpg2 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 && \
-    curl -sSL https://get.rvm.io | bash -s stable --ruby=2.4.1 --autolibs=read-fail
-RUN gem install fastlane
\ No newline at end of file
+#Install AWS CLI
+RUN pip install awscli --upgrade --user
\ No newline at end of file
diff --git a/Jenkinsfile.upload b/Jenkinsfile.upload
index c2a0912e9..004aac602 100644
--- a/Jenkinsfile.upload
+++ b/Jenkinsfile.upload
@@ -1,66 +1,73 @@
 #!/bin/env groovy
-
+@Library(['cliqz-shared-library@v1.2']) _
+properties([
+    parameters([
+        choice(choices: ['cliqz', 'lumen'], defaultValue: 'lumen', description: 'Which Product ?', name: 'product')
+    ])
+])
 node('master'){
     def imageName = 'android-browser'
-    def branchName = "${BRANCH_NAME}"
-
     stage('Checkout'){
         checkout scm
     }
-
     stage('Build docker image') {
         docker.build(imageName, '--build-arg UID=`id -u` --build-arg GID=`id -g` .')
     }
-
     docker.image(imageName).inside() {
-        stage('Extension') {
-            sh '''
-                set -x
-                set -e
-                yarn  
-                npm run bundle
-            '''
-        }
-
-        withEnv(["GRADLE_USER_HOME=${pwd()}/gradle_home","BN=${branchName}"]) {
-            withCredentials([
-                    file(credentialsId: '263e59fb-e9de-4e51-962c-0237c6ee167b', variable: 'CERT_PATH'),
-                    string(credentialsId: '60354bba-8ed0-4df9-8f8e-5be7454c1680', variable: 'CERT_PASS'),
-                    file(credentialsId: '2939d2e1-dd9a-4097-adc2-430e3d67157a', variable: 'PLAY_STORE_CERT')]) {
-                sh 'echo $BN'
-                if ("${BN}".contains("-re")) {
-                    stage('Compile') {
-                        sh './gradlew clean assembleStandardFatRelease'
-                    }
-                }else {
+        try {
+            stage('Extension') {
+                sh '''#!/bin/bash -l
+                    set -x
+                    set -e
+                    npm ci
+                    npm run bundle
+                '''
+            }
+            withEnv(["GRADLE_USER_HOME=${pwd()}/gradle_home"]) {
+                withCredentials([
+                        file(credentialsId: '263e59fb-e9de-4e51-962c-0237c6ee167b', variable: 'CERT_PATH'),
+                        string(credentialsId: '60354bba-8ed0-4df9-8f8e-5be7454c1680', variable: 'CERT_PASS'),
+                        file(credentialsId: '2939d2e1-dd9a-4097-adc2-430e3d67157a', variable: 'PLAY_STORE_CERT'),
+                        file(credentialsId: '3796eb16-42cd-4551-a5a5-c4fe3a18719a', variable: 'CLIQZ_CONFIG_JSON'),
+                        file(credentialsId: '6006a534-9f2e-4ba8-93f9-f0f27c0713df', variable: 'GOOGLE_SERVICES')]) {
                     stage('Compile and Upload') {
-                        sh '''#!/bin/bash -l
-                            set -x
-                            set -e
-                            fastlane android alpha
-                        '''
+                            sh '''#!/bin/bash -l
+                                set -x
+                                set -e
+                                cp $CLIQZ_CONFIG_JSON app/cliqz-config.json
+                                cp $GOOGLE_SERVICES app/google-services.json
+                            '''
+                            if(params.product == "cliqz") {
+                                sh '''#!/bin/bash -l
+                                    set -x
+                                    set -e
+                                    export APP_PACKAGE="com.cliqz.browser"
+                                    fastlane android internal_cliqz
+                                '''
+                            }
+                            if(params.product == "lumen") {
+                                sh '''#!/bin/bash -l
+                                    set -x
+                                    set -e
+                                    export APP_PACKAGE="com.cliqz.lumen"
+                                    fastlane android internal_lumen
+                                '''
+                            }
+                        }
                     }
                 }
-            }
-        }
-
-    }
-    if ("${branchName}".contains("-re")) {
-        def id = "Cliqz_Browser_android"+"${branchName}".substring("${branchName}".indexOf("v"), "${branchName}".indexOf("-"))
-        stage('Upload') {
-            withCredentials([
-                    [
-                            $class          : 'UsernamePasswordMultiBinding',
-                            credentialsId   : 'f1732e5f-3e84-47ad-9286-a5fa6657ec43',
-                            passwordVariable: 'AWS_SECRET_ACCESS_KEY',
-                            usernameVariable: 'AWS_ACCESS_KEY_ID',
-                    ]
-            ]) {
-                def s3Path = 's3://repository.cliqz.com/dist/android/release/apk'
-                def apkPath = "app/build/outputs/apk/standardFat/release/app-standard-fat-release.apk"
-
-                sh "aws s3 cp --acl public-read --acl bucket-owner-full-control ${apkPath} ${s3Path}/${id}.apk"
-                sh "aws s3 cp --acl public-read --acl bucket-owner-full-control ${s3Path}/${id}.apk ${s3Path}/latest.apk"
+            } finally {
+            stage('Upload Artifacts and Clean Up') {
+                archiveArtifacts allowEmptyArchive: true, artifacts: 'app/build/**/*.apk'
+                sh'''#!/bin/bash -l
+                    set -x
+                    set -e
+                    rm -f app/cliqz-config.json
+                    rm -f app/google-services.json
+                    rm -rf app/build
+                    rm -rf jsengine/*
+                    rm -rf gradle_home/
+                '''
             }
         }
     }
diff --git a/app/build.gradle b/app/build.gradle
index d31f0219e..a205a2c01 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,7 +17,7 @@ android {
     }
 
     defaultConfig {
-        versionCode 106
+        versionCode 1
         versionName "1.8.4"
         multiDexEnabled true
 
diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
index 9ec1a77cc..80c2ba62a 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
@@ -21,10 +21,9 @@ class CliqzPlugin: Plugin<Project> {
             }
         }
 
-        val defaultVersionCode = android.defaultConfig.versionCode
         project.afterEvaluate {
             android.applicationVariants.forEach { variant ->
-                setVersionCode(defaultVersionCode, variant)
+                setVersionCode(variant)
                 createCliqzConfigTasks(project, variant)
             }
         }
@@ -54,14 +53,17 @@ class CliqzPlugin: Plugin<Project> {
         }
     }
 
-    private fun setVersionCode(defaultVersionCode: Int, variant: ApplicationVariant) {
+    private fun setVersionCode(variant: ApplicationVariant) {
+        val buildNumber = System.getenv("BUILD_NUMBER")?.toIntOrNull()
+        if (buildNumber == null) return;
+        val versionCode = 110 + buildNumber
         val apiVersion = variant.productFlavors[0].versionCode
         variant.outputs.forEach { output ->
             val abi = output.filters.find { it.filterType == OutputFile.ABI }
             abi?.let {
                 val abiVersion = ABI_CODES[it.identifier]
                 (output as ApkVariantOutput).versionCodeOverride =
-                        defaultVersionCode * 100 + apiVersion * 10 + abiVersion!!
+                        versionCode * 100 + apiVersion * 10 + abiVersion!!
             }
         }
     }
diff --git a/fastlane/Appfile b/fastlane/Appfile
index 4d0bab144..c8d9ea785 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -1,2 +1,2 @@
 json_key_file(ENV["PLAY_STORE_CERT"]) # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
-package_name("com.cliqz.browser") # e.g. com.krausefx.app
+package_name(ENV["APP_PACKAGE"]) # e.g. com.krausefx.app
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f0396d1e2..e7bf0d5fa 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -7,17 +7,28 @@
 #
 
 # Uncomment the line if you want fastlane to automatically update itself
-  update_fastlane
+# update_fastlane
 
 default_platform(:android)
 
 platform :android do
   desc "Submit a new alpha Build to the Google Play Store"
-  lane :alpha do
-    gradle(task: "clean assembleStandardArmRelease assembleStandardX6Release")
+  lane :internal_lumen do
+    gradle(task: "clean assembleLumenRelease")
     upload_to_play_store(
       apk_paths:ENV["GRADLE_ALL_APK_OUTPUT_PATHS"],
-      track:"alpha",
+      track:"internal",
+      skip_upload_metadata: true,
+      skip_upload_images: true,
+      skip_upload_screenshots: true,
+    )
+  end
+
+  lane :internal_cliqz do
+    gradle(task: "clean assembleCliqzRelease")
+    upload_to_play_store(
+      apk_paths:ENV["GRADLE_ALL_APK_OUTPUT_PATHS"],
+      track:"internal",
       skip_upload_metadata: true,
       skip_upload_images: true,
       skip_upload_screenshots: true,

From fc553e597ea9fd5b84650fc308eeac2376e699c0 Mon Sep 17 00:00:00 2001
From: Jayesh Solanki <jayeshsolanki93@gmail.com>
Date: Wed, 3 Jul 2019 11:15:47 +0200
Subject: [PATCH 10/57] AP-360 Implement design changes on subscription screen
 (#138)

* AP-360 Implement design changes on subscription screen

* Tint close drawable instead of having multiple colored drawable
---
 .../cliqz/res/layout/activity_overview.xml    |  3 +-
 app/src/lumen/res/drawable/ic_close_black.xml |  5 --
 .../subscription_button_background.xml        |  4 +-
 .../res/drawable/subscription_item_border.xml | 10 ++--
 .../subscription_item_hollow_border.xml       |  6 +--
 .../lumen/res/layout/fragment_purchase.xml    |  5 +-
 .../subscription_product_row_default.xml      | 47 ++++++++++---------
 .../subscription_product_row_highlighted.xml  | 47 ++++++++++---------
 app/src/lumen/res/values/colors.xml           |  3 ++
 app/src/main/res/drawable/ic_clear_white.xml  |  9 ----
 app/src/main/res/values/styles.xml            |  7 ++-
 11 files changed, 72 insertions(+), 74 deletions(-)
 delete mode 100644 app/src/lumen/res/drawable/ic_close_black.xml
 delete mode 100644 app/src/main/res/drawable/ic_clear_white.xml

diff --git a/app/src/cliqz/res/layout/activity_overview.xml b/app/src/cliqz/res/layout/activity_overview.xml
index c73178c0c..972b871f6 100644
--- a/app/src/cliqz/res/layout/activity_overview.xml
+++ b/app/src/cliqz/res/layout/activity_overview.xml
@@ -32,7 +32,8 @@
                     android:layout_width="@dimen/icon_width"
                     android:layout_height="@dimen/icon_height"
                     android:layout_gravity="center"
-                    app:srcCompat="@drawable/ic_clear_white"/>
+                    android:tint="@android:color/white"
+                    app:srcCompat="@drawable/ic_clear_black"/>
             </FrameLayout>
 
             <FrameLayout
diff --git a/app/src/lumen/res/drawable/ic_close_black.xml b/app/src/lumen/res/drawable/ic_close_black.xml
deleted file mode 100644
index 78a987db9..000000000
--- a/app/src/lumen/res/drawable/ic_close_black.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="32dp" android:tint="#4C88EC"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
diff --git a/app/src/lumen/res/drawable/subscription_button_background.xml b/app/src/lumen/res/drawable/subscription_button_background.xml
index e57dc6db5..bad8929e1 100644
--- a/app/src/lumen/res/drawable/subscription_button_background.xml
+++ b/app/src/lumen/res/drawable/subscription_button_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#3373D7" />
-    <corners android:radius="6dp" />
+    <solid android:color="@color/lumen_color_blue_primary" />
+    <corners android:radius="4dp" />
 </shape>
diff --git a/app/src/lumen/res/drawable/subscription_item_border.xml b/app/src/lumen/res/drawable/subscription_item_border.xml
index 829163c63..165a2ca45 100644
--- a/app/src/lumen/res/drawable/subscription_item_border.xml
+++ b/app/src/lumen/res/drawable/subscription_item_border.xml
@@ -4,12 +4,12 @@
     <item android:drawable="@drawable/subscription_item_hollow_border" />
 
     <item
-        android:bottom="3dp"
-        android:left="3dp"
-        android:right="3dp"
-        android:top="3dp">
+        android:bottom="4dp"
+        android:left="4dp"
+        android:right="4dp"
+        android:top="4dp">
         <shape android:shape="rectangle">
-            <solid android:color="#1B1F3D" />
+            <solid android:color="@color/lumen_color_background" />
         </shape>
     </item>
 
diff --git a/app/src/lumen/res/drawable/subscription_item_hollow_border.xml b/app/src/lumen/res/drawable/subscription_item_hollow_border.xml
index c03b2ff4e..e415ec901 100644
--- a/app/src/lumen/res/drawable/subscription_item_hollow_border.xml
+++ b/app/src/lumen/res/drawable/subscription_item_hollow_border.xml
@@ -3,9 +3,9 @@
     <item>
         <shape android:shape="rectangle">
             <gradient
-                android:centerColor="#9DA7EE"
-                android:endColor="#2B75D8"
-                android:startColor="#E2A9B6"
+                android:centerColor="#A4ACFE"
+                android:endColor="#1C9EFF"
+                android:startColor="#DFAAB7"
                 android:type="linear" />
         </shape>
     </item>
diff --git a/app/src/lumen/res/layout/fragment_purchase.xml b/app/src/lumen/res/layout/fragment_purchase.xml
index c07cdce7a..8aff3d6fc 100644
--- a/app/src/lumen/res/layout/fragment_purchase.xml
+++ b/app/src/lumen/res/layout/fragment_purchase.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#1B1F3D"
+    android:background="@color/lumen_color_background"
     tools:context="com.cliqz.browser.purchases.PurchaseFragment">
 
     <ImageButton
@@ -16,7 +16,8 @@
         android:background="@color/transparent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_close_black" />
+        android:tint="@android:color/white"
+        app:srcCompat="@drawable/ic_clear_black" />
 
     <ProgressBar
         android:id="@+id/loading"
diff --git a/app/src/lumen/res/layout/subscription_product_row_default.xml b/app/src/lumen/res/layout/subscription_product_row_default.xml
index 27df1bd68..195429ea7 100644
--- a/app/src/lumen/res/layout/subscription_product_row_default.xml
+++ b/app/src/lumen/res/layout/subscription_product_row_default.xml
@@ -3,10 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="160dp"
+    android:layout_height="170dp"
     android:layout_marginStart="10dp"
     android:layout_marginEnd="10dp"
-    android:layout_marginBottom="8dp"
     android:background="@drawable/subscription_item_border"
     android:gravity="center"
     android:orientation="vertical">
@@ -15,7 +14,7 @@
         android:id="@+id/horizontal_row"
         android:layout_width="match_parent"
         android:layout_height="2dp"
-        android:layout_marginTop="45dp"
+        android:layout_marginTop="50dp"
         android:background="@drawable/subscription_item_hollow_border"
         app:layout_constraintEnd_toStartOf="parent"
         app:layout_constraintStart_toEndOf="parent"
@@ -25,15 +24,15 @@
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="14dp"
+        android:layout_marginStart="18dp"
         android:layout_marginEnd="14dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textAllCaps="true"
         android:textColor="@color/white"
-        android:textSize="19sp"
+        android:textSize="15sp"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/horizontal_row"
+        app:layout_constraintBottom_toBottomOf="@+id/horizontal_row"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
@@ -44,10 +43,11 @@
         android:id="@+id/price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="14dp"
+        android:layout_marginTop="26dp"
         android:textAllCaps="true"
         android:textColor="@color/white"
-        android:textSize="19sp"
+        android:textSize="15sp"
+        android:textStyle="bold"
         app:layout_constraintStart_toStartOf="@+id/title"
         app:layout_constraintTop_toBottomOf="@+id/horizontal_row"
         tools:text="4,99 $/MONTH" />
@@ -55,29 +55,30 @@
     <Button
         android:id="@+id/buy_subscription"
         android:layout_width="wrap_content"
-        android:layout_height="35dp"
-        android:layout_marginEnd="12dp"
+        android:layout_height="50dp"
+        android:layout_marginEnd="22dp"
         android:background="@drawable/subscription_button_background"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
         android:text="@string/button_buy_subscription"
         android:textAllCaps="true"
         android:textColor="@color/white"
-        android:textSize="19sp"
+        android:textSize="15sp"
         app:layout_constraintBaseline_toBaselineOf="@id/price"
         app:layout_constraintEnd_toEndOf="parent" />
 
     <TextView
         android:id="@+id/is_subscribed"
         android:layout_width="wrap_content"
-        android:layout_height="35dp"
-        android:layout_marginEnd="12dp"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
+        android:layout_height="50dp"
+        android:layout_marginEnd="22dp"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
         android:text="@string/text_subscribed"
         android:textAllCaps="true"
-        android:textColor="#4C88EC"
-        android:textSize="19sp"
+        android:textColor="@color/lumen_color_blue_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
         android:visibility="gone"
         app:layout_constraintBaseline_toBaselineOf="@id/price"
         app:layout_constraintEnd_toEndOf="parent" />
@@ -87,18 +88,18 @@
         android:layout_width="315dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="14dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="18dp"
         android:ellipsize="end"
         android:maxLines="2"
         android:textAllCaps="true"
-        android:textColor="#A3A9BA"
-        android:textSize="14sp"
+        android:textColor="@color/lumen_color_grey_text"
+        android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/buy_subscription"
         app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintVertical_bias="1"
         app:layout_constraintStart_toStartOf="@+id/price"
         app:layout_constraintTop_toBottomOf="@id/buy_subscription"
+        app:layout_constraintVertical_bias="1"
         tools:text="Ultimate Protection online" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/lumen/res/layout/subscription_product_row_highlighted.xml b/app/src/lumen/res/layout/subscription_product_row_highlighted.xml
index e969f7939..49792db62 100644
--- a/app/src/lumen/res/layout/subscription_product_row_highlighted.xml
+++ b/app/src/lumen/res/layout/subscription_product_row_highlighted.xml
@@ -3,10 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="160dp"
+    android:layout_height="170dp"
     android:layout_marginStart="10dp"
+    android:layout_marginTop="25dp"
     android:layout_marginEnd="10dp"
-    android:layout_marginBottom="8dp"
+    android:layout_marginBottom="25dp"
     android:background="@drawable/subscription_item_border"
     android:gravity="center"
     android:orientation="vertical">
@@ -34,16 +35,16 @@
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="14dp"
+        android:layout_marginStart="18dp"
         android:layout_marginEnd="14dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textAllCaps="true"
-        android:textColor="#1B1F3D"
-        android:textSize="19sp"
+        android:textColor="@color/lumen_color_background"
+        android:textSize="17sp"
         android:textStyle="bold"
         app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@+id/horizontal_row"
+        app:layout_constraintBottom_toBottomOf="@+id/horizontal_row"
         app:layout_constraintEnd_toStartOf="@id/highlighted_title"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -53,30 +54,30 @@
         android:id="@+id/highlighted_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="14dp"
         android:maxLines="2"
         android:text="@string/subscription_product_row_highlighted"
         android:textAlignment="textEnd"
         android:textAllCaps="true"
-        android:textColor="#1B1F3D"
+        android:textColor="@color/lumen_color_background"
         android:textSize="13sp"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/horizontal_row"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/horizontal_row"
+        app:layout_constraintEnd_toEndOf="@+id/buy_subscription"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toEndOf="@id/title"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.59"
+        app:layout_constraintVertical_bias="0.5"
         tools:text="Best offer\n Limited Time Only" />
 
     <TextView
         android:id="@+id/price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="14dp"
+        android:layout_marginTop="26dp"
         android:textAllCaps="true"
         android:textColor="@color/white"
-        android:textSize="19sp"
+        android:textSize="15sp"
+        android:textStyle="bold"
         app:layout_constraintStart_toStartOf="@+id/title"
         app:layout_constraintTop_toBottomOf="@+id/horizontal_row"
         tools:text="4,99 $/MONTH" />
@@ -84,35 +85,35 @@
     <Button
         android:id="@+id/buy_subscription"
         android:layout_width="wrap_content"
-        android:layout_height="35dp"
-        android:layout_marginEnd="12dp"
+        android:layout_height="50dp"
+        android:layout_marginEnd="22dp"
         android:background="@drawable/subscription_button_background"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
         android:text="@string/button_buy_subscription"
         android:textAllCaps="true"
         android:textColor="@color/white"
-        android:textSize="19sp"
+        android:textSize="15sp"
         app:layout_constraintBaseline_toBaselineOf="@id/price"
         app:layout_constraintEnd_toEndOf="parent" />
 
     <TextView
         android:id="@+id/description"
-        android:layout_width="315dp"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="14dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="18dp"
         android:ellipsize="end"
         android:maxLines="2"
         android:textAllCaps="true"
-        android:textColor="#A3A9BA"
-        android:textSize="14sp"
+        android:textColor="@color/lumen_color_grey_text"
+        android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@id/buy_subscription"
         app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintVertical_bias="1"
         app:layout_constraintStart_toStartOf="@+id/price"
         app:layout_constraintTop_toBottomOf="@+id/buy_subscription"
+        app:layout_constraintVertical_bias="0.5"
         tools:text="Ultimate Protection online + Protection from Hackers With VPN" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/lumen/res/values/colors.xml b/app/src/lumen/res/values/colors.xml
index 905b5d398..72523d5ed 100644
--- a/app/src/lumen/res/values/colors.xml
+++ b/app/src/lumen/res/values/colors.xml
@@ -39,4 +39,7 @@
     <color name="dark_transparent_overlay">#99000000</color>
     <color name="bond_disabled_state_color">#BDC0CE</color>
     <color name="lumen_color_blue_secondary">#304572</color>
+    <color name="lumen_color_blue_primary">#1B9CFC</color>
+    <color name="lumen_color_background">#0D1429</color>
+    <color name="lumen_color_grey_text">#80FFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_clear_white.xml b/app/src/main/res/drawable/ic_clear_white.xml
deleted file mode 100644
index 66003fb7b..000000000
--- a/app/src/main/res/drawable/ic_clear_white.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 798f8f84b..73f34cb8d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -57,7 +57,12 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="android:windowActionModeOverlay">true</item>
         <item name="actionModeStyle">@style/Widget.Cliqz.ActionMode</item>
-        <item name="android:actionModeCloseDrawable">@drawable/ic_clear_white</item>
+        <item name="android:actionModeCloseDrawable">@drawable/ic_clear_black</item>
+        <item name="android:actionModeCloseButtonStyle">@style/closeButtonStyle</item>
+    </style>
+
+    <style name="closeButtonStyle" parent="@style/Widget.AppCompat.ActionButton.CloseMode">
+        <item name="android:tint">@android:color/white</item>
     </style>
 
     <style name="overFlowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">

From d2a5ed79a76964e8f84a9347d320fbb051ab3019 Mon Sep 17 00:00:00 2001
From: Jayesh Solanki <jayeshsolanki93@gmail.com>
Date: Wed, 3 Jul 2019 17:59:36 +0200
Subject: [PATCH 11/57] Configure RevenueCat products for release (#142)

---
 .../browser/purchases/PurchaseFragment.kt     | 22 +++++++++++++------
 .../browser/purchases/PurchasesManager.kt     |  6 +++--
 .../purchases/SubscriptionConstants.kt        | 14 +++++++-----
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
index 4856b0f17..47e8a3ab5 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
@@ -74,7 +74,13 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
             override fun onReceived(entitlementMap: Map<String, Entitlement>) {
                 val productList = ArrayList<ProductRowData>()
                 var isSubscribed = false
-                entitlementMap[Entitlements.PREMIUM_SALE]?.offerings?.forEach { (_, offering) ->
+                val entitlement = if (entitlementMap[Entitlements.PREMIUM_SALE] == null) {
+                    entitlementMap[Entitlements.PREMIUM_SALE_STAGING]
+                } else {
+                    entitlementMap[Entitlements.PREMIUM_SALE]
+                }
+
+                entitlement?.offerings?.forEach { (_, offering) ->
                     offering.skuDetails?.apply {
                         if (sku == purchasesManager.purchase.sku) {
                             isSubscribed = true
@@ -85,13 +91,15 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
                     }
                 }
                 if (productList.isEmpty()) {
-                    // TODO: Display error
+                    Toast.makeText(context, "Error retrieving available products", Toast.LENGTH_LONG).show()
+                    Log.e(TAG, "Product list is empty.")
+                    dismiss()
                 } else {
                     customSwapProductListElements(productList)
                     mAdapter.setHasSubscription(isSubscribed)
                     mAdapter.updateProductList(productList)
-                    setLoading(false)
                 }
+                setLoading(false)
             }
 
             override fun onError(error: PurchasesError) {
@@ -170,19 +178,19 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
 
     private fun enableFeatures(sku: String) {
         when (sku) {
-            Product.BASIC_VPN -> {
+            Product.BASIC_VPN, Product.BASIC_VPN_STAGING -> {
                 purchasesManager.purchase.isVpnEnabled = true
                 purchasesManager.purchase.isDashboardEnabled = true
                 preferenceManager.isAttrackEnabled = true
                 preferenceManager.adBlockEnabled = true
             }
-            Product.BASIC -> {
+            Product.BASIC, Product.BASIC_STAGING -> {
                 purchasesManager.purchase.isVpnEnabled = false
                 purchasesManager.purchase.isDashboardEnabled = true
                 preferenceManager.isAttrackEnabled = true
                 preferenceManager.adBlockEnabled = true
             }
-            Product.VPN -> {
+            Product.VPN, Product.VPN_STAGING -> {
                 purchasesManager.purchase.isVpnEnabled = true
                 purchasesManager.purchase.isDashboardEnabled = false
                 preferenceManager.isAttrackEnabled = false
@@ -192,6 +200,6 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
         purchasesManager.purchase.sku = sku
         purchasesManager.purchase.isASubscriber = true
         bus.post(Messages.PurchaseCompleted())
-        this@PurchaseFragment.dismiss()
+        dismiss()
     }
 }
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
index 3a54a24df..11cc07522 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
@@ -44,8 +44,10 @@ class PurchasesManager(
         if (purchaserInfo.activeSubscriptions.isNotEmpty()) {
             // If subscribed, enable features.
             for (sku in purchaserInfo.activeSubscriptions) {
-                val isVpnEnabled = sku == Product.VPN || sku == Product.BASIC_VPN
-                val isDashboardEnabled = sku == Product.BASIC || sku == Product.BASIC_VPN
+                val isVpnEnabled = sku in setOf(Product.VPN, Product.VPN_STAGING, Product.BASIC_VPN,
+                        Product.BASIC_VPN_STAGING)
+                val isDashboardEnabled = sku in setOf(Product.BASIC, Product.BASIC_STAGING,
+                        Product.BASIC_VPN, Product.BASIC_VPN_STAGING)
                 purchase.apply {
                     this.isASubscriber = true
                     this.isVpnEnabled = isVpnEnabled
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/SubscriptionConstants.kt b/app/src/lumen/java/com/cliqz/browser/purchases/SubscriptionConstants.kt
index 45747e70c..ef9df94dc 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/SubscriptionConstants.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/SubscriptionConstants.kt
@@ -3,17 +3,21 @@ package com.cliqz.browser.purchases
 class SubscriptionConstants {
 
     internal object Entitlements {
-        const val PREMIUM_PROMO = "[Staging] Premium Promo"
-        const val PREMIUM_SALE = "[Staging] Premium Sale"
+        const val PREMIUM_SALE_STAGING = "[Staging] Premium Sale"
+        const val PREMIUM_SALE = "Premium Sale"
     }
 
     /**
      * Product ID on RevenueCat and Google Play Console.
      */
     internal object Product {
-        const val BASIC = "com.cliqz.android.lumen.staging.sale.basic"
-        const val VPN = "com.cliqz.android.lumen.staging.sale.vpn"
-        const val BASIC_VPN = "com.cliqz.android.lumen.staging.sale.basic_vpn"
+        const val BASIC = "com.cliqz.android.lumen.sale.basic"
+        const val VPN = "com.cliqz.android.lumen.sale.vpn"
+        const val BASIC_VPN = "com.cliqz.android.lumen.sale.basic_vpn"
+
+        const val BASIC_STAGING = "com.cliqz.android.lumen.staging.sale.basic"
+        const val VPN_STAGING = "com.cliqz.android.lumen.staging.sale.vpn"
+        const val BASIC_VPN_STAGING = "com.cliqz.android.lumen.staging.sale.basic_vpn"
     }
 
 }

From 54e9eae9a71b604423832fa9c086dff907c73fc9 Mon Sep 17 00:00:00 2001
From: Sharath <sharath@cliqz.com>
Date: Wed, 3 Jul 2019 18:00:17 +0200
Subject: [PATCH 12/57] Fix Universal Build and Jenkins Secret File Error
 (#141)

---
 Jenkinsfile.upload | 4 ++--
 app/build.gradle   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile.upload b/Jenkinsfile.upload
index 004aac602..99a1e2f3f 100644
--- a/Jenkinsfile.upload
+++ b/Jenkinsfile.upload
@@ -34,8 +34,8 @@ node('master'){
                             sh '''#!/bin/bash -l
                                 set -x
                                 set -e
-                                cp $CLIQZ_CONFIG_JSON app/cliqz-config.json
-                                cp $GOOGLE_SERVICES app/google-services.json
+                                cp "$CLIQZ_CONFIG_JSON" app/cliqz-config.json
+                                cp "$GOOGLE_SERVICES" app/google-services.json
                             '''
                             if(params.product == "cliqz") {
                                 sh '''#!/bin/bash -l
diff --git a/app/build.gradle b/app/build.gradle
index a205a2c01..38034bf0f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -105,7 +105,7 @@ android {
             enable true
             reset()
             include "x86", "armeabi-v7a", "arm64-v8a", "x86_64"
-            universalApk true
+            universalApk false
         }
     }
 }

From 59c2de266e687451809401295f446c0c74e013c6 Mon Sep 17 00:00:00 2001
From: ravjit-cliqz <ravjit@cliqz.com>
Date: Wed, 3 Jul 2019 18:01:36 +0200
Subject: [PATCH 13/57] AP-264 update url bar icons and colors (#134)

* AP-264 update url bar icons and colors

* Updated toolbar paddings and margins
---
 app/src/cliqz/res/drawable/ic_clear.xml       |  9 +++
 app/src/cliqz/res/values/colors.xml           |  1 +
 app/src/lumen/res/drawable/ic_action_back.xml | 18 ++++++
 app/src/lumen/res/drawable/ic_clear.xml       |  9 +++
 .../res/drawable/ic_dashboard_checked.xml     | 33 ++++++++++
 .../lumen/res/drawable/ic_dashboard_off.xml   | 36 ++++++-----
 .../lumen/res/drawable/ic_dashboard_on.xml    | 51 +++++++--------
 .../lumen/res/drawable/ic_reader_mode_off.xml | 30 +++++++++
 .../lumen/res/drawable/ic_reader_mode_on.xml  | 24 +++++++
 app/src/lumen/res/drawable/ic_vpn_off.xml     | 34 +++++-----
 app/src/lumen/res/drawable/ic_vpn_on.xml      | 62 +++++++++----------
 .../res/layout/fragment_search_toolbar.xml    | 22 ++-----
 .../lumen/res/layout/search_bar_widget.xml    | 18 +++++-
 app/src/lumen/res/values/colors.xml           |  1 +
 .../browser/lightning/view/LightningView.java |  7 ++-
 .../com/cliqz/browser/main/TabFragment.java   | 12 ++--
 .../browser/widget/AutocompleteEditText.java  |  4 +-
 .../com/cliqz/browser/widget/SearchBar.java   | 14 +++++
 app/src/main/res/layout/fragment_base.xml     |  8 +--
 app/src/main/res/values/colors.xml            |  1 -
 app/src/main/res/values/dimens.xml            |  6 +-
 21 files changed, 273 insertions(+), 127 deletions(-)
 create mode 100644 app/src/cliqz/res/drawable/ic_clear.xml
 create mode 100644 app/src/lumen/res/drawable/ic_action_back.xml
 create mode 100644 app/src/lumen/res/drawable/ic_clear.xml
 create mode 100644 app/src/lumen/res/drawable/ic_dashboard_checked.xml
 create mode 100644 app/src/lumen/res/drawable/ic_reader_mode_off.xml
 create mode 100644 app/src/lumen/res/drawable/ic_reader_mode_on.xml

diff --git a/app/src/cliqz/res/drawable/ic_clear.xml b/app/src/cliqz/res/drawable/ic_clear.xml
new file mode 100644
index 000000000..ede4b7108
--- /dev/null
+++ b/app/src/cliqz/res/drawable/ic_clear.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/app/src/cliqz/res/values/colors.xml b/app/src/cliqz/res/values/colors.xml
index a9aec6a50..20d08e245 100644
--- a/app/src/cliqz/res/values/colors.xml
+++ b/app/src/cliqz/res/values/colors.xml
@@ -34,6 +34,7 @@
     <color name="url_bar_text_color_normal">#333333</color>
     <color name="url_bar_bg_incognito">#ffffff</color>
     <color name="url_bar_text_color_incognito">#333333</color>
+    <color name="url_bar_hint_text_color">#AAAAAA</color>
     <color name="toolbar_icon_color_normal">#333333</color>
     <color name="toolbar_icon_color_incognito">#ffffff</color>
 
diff --git a/app/src/lumen/res/drawable/ic_action_back.xml b/app/src/lumen/res/drawable/ic_action_back.xml
new file mode 100644
index 000000000..e88e0fa88
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_action_back.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.7326,12.4001L7,12.4001"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12.9,18.864l-6.364,-6.364l0,0l6.364,-6.364"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/lumen/res/drawable/ic_clear.xml b/app/src/lumen/res/drawable/ic_clear.xml
new file mode 100644
index 000000000..1e2d044be
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_clear.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/app/src/lumen/res/drawable/ic_dashboard_checked.xml b/app/src/lumen/res/drawable/ic_dashboard_checked.xml
new file mode 100644
index 000000000..652fce387
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_dashboard_checked.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,4.3528L5.25,7.1459L5.25,11.2759C5.25,15.2108 8.1391,18.9033 12,19.92C15.8609,18.9033 18.75,15.2108 18.75,11.2759L18.75,7.1459L12,4.3528Z"
+      android:strokeAlpha="0.99714005"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.99714005">
+    <aapt:attr name="android:strokeColor">
+      <gradient 
+          android:startY="1.8971632"
+          android:startX="12"
+          android:endY="22.458393"
+          android:endX="12"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDEA8B4"/>
+        <item android:offset="0.6901921" android:color="#FFACADFF"/>
+        <item android:offset="1" android:color="#FF1B99F8"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M10,12.1988l1.5892,1.6443l2.5618,-3.843"
+      android:strokeWidth="0.85"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/lumen/res/drawable/ic_dashboard_off.xml b/app/src/lumen/res/drawable/ic_dashboard_off.xml
index d3ca74824..9e59de417 100644
--- a/app/src/lumen/res/drawable/ic_dashboard_off.xml
+++ b/app/src/lumen/res/drawable/ic_dashboard_off.xml
@@ -1,18 +1,20 @@
-<vector android:height="24dp" android:viewportHeight="82"
-    android:viewportWidth="78" android:width="24dp"
-    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000" android:fillType="nonZero"
-        android:pathData="M37.5,8.4318L9.2537,19.8819L9.2537,36.9091C9.2537,52.9123 21.3551,67.8488 37.5,71.6874C53.6449,67.8488 65.7463,52.9123 65.7463,36.9091L65.7463,19.8819L37.5,8.4318Z" android:strokeWidth="4.507317">
-        <aapt:attr name="android:strokeColor">
-            <gradient android:endX="37.5" android:endY="71.6874"
-                android:startX="37.5" android:startY="8.4318" android:type="linear">
-                <item android:color="#FFBDC0CE" android:offset="0"/>
-                <item android:color="#FF9FA2AF" android:offset="0.568564"/>
-                <item android:color="#FF7E808B" android:offset="1"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path android:fillColor="#BDC0CE" android:fillType="evenOdd"
-        android:pathData="M28,30.6912l8.7705,8.3088l-8.7705,8.3088l0.7295,0.6912l8.7705,-8.3088l8.7705,8.3088l0.7295,-0.6912l-8.7705,-8.3088l8.7705,-8.3088l-0.7295,-0.6912l-8.7705,8.3088l-8.7705,-8.3088z"
-        android:strokeColor="#BDC0CE" android:strokeWidth="3.04243889"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,4.3528L5.25,7.1459L5.25,11.2759C5.25,15.2108 8.1391,18.9033 12,19.92C15.8609,18.9033 18.75,15.2108 18.75,11.2759L18.75,7.1459L12,4.3528Z"
+      android:strokeAlpha="0.99714005"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#B2B2B2"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.99714005"/>
+  <path
+      android:pathData="M12.4582,11.874L14.111,13.5268L13.5701,14.0678L11.9172,12.4149L10.1773,14.1548L9.5763,13.5538L11.3162,11.8139L9.5926,10.0903L10.1335,9.5494L11.8571,11.2729L13.5538,9.5763L14.1548,10.1773L12.4582,11.874Z"
+      android:strokeWidth="1"
+      android:fillColor="#B2B2B2"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/lumen/res/drawable/ic_dashboard_on.xml b/app/src/lumen/res/drawable/ic_dashboard_on.xml
index 5869d34c5..8668f8c2a 100644
--- a/app/src/lumen/res/drawable/ic_dashboard_on.xml
+++ b/app/src/lumen/res/drawable/ic_dashboard_on.xml
@@ -1,26 +1,27 @@
-<vector android:height="24dp" android:viewportHeight="82"
-    android:viewportWidth="78" android:width="24dp"
-    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000" android:fillType="nonZero"
-        android:pathData="M39,9.0822L11,20.6684L11,38C11,54.181 23.0103,69.2257 39,72.9737C54.9897,69.2257 67,54.181 67,38L67,20.6684L39,9.0822Z" android:strokeWidth="2">
-        <aapt:attr name="android:strokeColor">
-            <gradient android:endX="39" android:endY="72.9737"
-                android:startX="39" android:startY="9.0822" android:type="linear">
-                <item android:color="#FFE4A9AF" android:offset="0"/>
-                <item android:color="#FFBEB9F5" android:offset="0.3693551"/>
-                <item android:color="#FF3073DB" android:offset="1"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path android:fillColor="#00000000" android:fillType="nonZero"
-        android:pathData="M39,9.0822L11,20.6684L11,38C11,54.181 23.0103,69.2257 39,72.9737C54.9897,69.2257 67,54.181 67,38L67,20.6684L39,9.0822Z" android:strokeWidth="2">
-        <aapt:attr name="android:strokeColor">
-            <gradient android:endX="39" android:endY="72.9737"
-                android:startX="39" android:startY="9.0822" android:type="linear">
-                <item android:color="#FFE4A9AF" android:offset="0"/>
-                <item android:color="#FFBEB9F5" android:offset="0.3693551"/>
-                <item android:color="#FF3073DB" android:offset="1"/>
-            </gradient>
-        </aapt:attr>
-    </path>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,4.3528L5.25,7.1459L5.25,11.2759C5.25,15.2108 8.1391,18.9033 12,19.92C15.8609,18.9033 18.75,15.2108 18.75,11.2759L18.75,7.1459L12,4.3528Z"
+      android:strokeAlpha="0.99714005"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.99714005">
+    <aapt:attr name="android:strokeColor">
+      <gradient 
+          android:startY="1.4021033"
+          android:startX="12"
+          android:endY="22.398647"
+          android:endX="12"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDEA8B4"/>
+        <item android:offset="0.6901921" android:color="#FFACADFF"/>
+        <item android:offset="1" android:color="#FF1B99F8"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>
diff --git a/app/src/lumen/res/drawable/ic_reader_mode_off.xml b/app/src/lumen/res/drawable/ic_reader_mode_off.xml
new file mode 100644
index 000000000..71c9c81d9
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_reader_mode_off.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,16.8271L19.3985,16.8271"
+      android:strokeAlpha="0.6"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.6"/>
+  <path
+      android:pathData="M4,11.8947L19.3985,11.8947"
+      android:strokeAlpha="0.6"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.6"/>
+  <path
+      android:pathData="M4,6.9624L10.0188,6.9624"
+      android:strokeAlpha="0.6"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.6"/>
+</vector>
diff --git a/app/src/lumen/res/drawable/ic_reader_mode_on.xml b/app/src/lumen/res/drawable/ic_reader_mode_on.xml
new file mode 100644
index 000000000..bc6307657
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_reader_mode_on.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,16.8271L19.3985,16.8271"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M4,11.8947L19.3985,11.8947"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M4,6.9624L10.0188,6.9624"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/lumen/res/drawable/ic_vpn_off.xml b/app/src/lumen/res/drawable/ic_vpn_off.xml
index 41b8d1e2c..100ede006 100644
--- a/app/src/lumen/res/drawable/ic_vpn_off.xml
+++ b/app/src/lumen/res/drawable/ic_vpn_off.xml
@@ -1,18 +1,18 @@
-<vector android:height="24dp" android:viewportHeight="82"
-    android:viewportWidth="121" android:width="24dp"
-    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#BDC0CE" android:fillType="nonZero"
-        android:pathData="M37.301,53.706L34.366,53.706L25.596,29.916L28.712,29.916L35.702,49.864L35.966,49.864L42.956,29.916L46.072,29.916L37.301,53.706ZM50.243,29.916L59.228,29.916C63.729,29.916 66.845,33.081 66.845,37.615C66.845,42.066 63.663,45.215 59.195,45.215L53.211,45.215L53.211,53.706L50.243,53.706L50.243,29.916ZM53.211,32.553L53.211,42.577L58.453,42.577C61.833,42.577 63.795,40.764 63.795,37.615C63.795,34.351 61.899,32.553 58.453,32.553L53.211,32.553ZM74.627,53.706L71.692,53.706L71.692,29.916L74.577,29.916L87.487,48.43L87.75,48.43L87.75,29.916L90.685,29.916L90.685,53.706L87.8,53.706L74.891,35.257L74.627,35.257L74.627,53.706Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M28.399,14.471L92.19,14.471A13.928,13.928 0,0 1,106.118 28.399L106.118,53.601A13.928,13.928 0,0 1,92.19 67.529L28.399,67.529A13.928,13.928 0,0 1,14.471 53.601L14.471,28.399A13.928,13.928 0,0 1,28.399 14.471z" android:strokeWidth="4.82352941">
-        <aapt:attr name="android:strokeColor">
-            <gradient android:endX="60.2945" android:endY="67.529"
-                android:startX="60.2945" android:startY="14.471" android:type="linear">
-                <item android:color="#FFBDC0CE" android:offset="0"/>
-                <item android:color="#FF9FA2AF" android:offset="0.568564"/>
-                <item android:color="#FF7E808B" android:offset="1"/>
-            </gradient>
-        </aapt:attr>
-    </path>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3.25,6.25h18.0333v11.5h-18.0333z"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#B2B2B2"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M8.5031,14.5094L7.575,14.5094L6,10L6.8906,10L8.025,13.5688L8.0781,13.5688L9.2031,10L10.0625,10L8.5031,14.5094ZM10.7541,10L12.5729,10C13.4729,10 14.0885,10.6156 14.0885,11.525C14.0885,12.4187 13.451,13.0313 12.5385,13.0313L11.5604,13.0313L11.5604,14.5094L10.7541,14.5094L10.7541,10ZM11.5604,10.675L11.5604,12.3625L12.3573,12.3625C12.9323,12.3625 13.2698,12.0625 13.2698,11.525C13.2698,10.9719 12.9416,10.675 12.3604,10.675L11.5604,10.675ZM15.6677,14.5094L14.8895,14.5094L14.8895,10L15.5895,10L17.802,13.0656L17.8552,13.0656L17.8552,10L18.6302,10L18.6302,14.5094L17.9333,14.5094L15.7208,11.4406L15.6677,11.4406L15.6677,14.5094Z"
+      android:strokeWidth="1"
+      android:fillColor="#B2B2B2"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/lumen/res/drawable/ic_vpn_on.xml b/app/src/lumen/res/drawable/ic_vpn_on.xml
index c64fb3f05..fdf45f9ad 100644
--- a/app/src/lumen/res/drawable/ic_vpn_on.xml
+++ b/app/src/lumen/res/drawable/ic_vpn_on.xml
@@ -1,33 +1,31 @@
-<vector android:height="24dp" android:viewportHeight="82"
-    android:viewportWidth="121" android:width="24dp"
-    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="0" android:fillColor="#00000000"
-        android:fillType="evenOdd"
-        android:pathData="M1.079,1.079h105.842v79.842h-105.842z"
-        android:strokeAlpha="0" android:strokeColor="#979797" android:strokeWidth="2.15789474"/>
-    <path android:fillColor="#FFFFFF" android:fillType="nonZero"
-        android:pathData="M42.294,57.667L39.353,57.667L30.564,33.828L33.687,33.828L40.691,53.817L40.955,53.817L47.96,33.828L51.082,33.828L42.294,57.667ZM55.262,33.828L64.265,33.828C68.775,33.828 71.898,37 71.898,41.543C71.898,46.003 68.709,49.159 64.232,49.159L58.236,49.159L58.236,57.667L55.262,57.667L55.262,33.828ZM58.236,36.471L58.236,46.516L63.489,46.516C66.876,46.516 68.842,44.698 68.842,41.543C68.842,38.272 66.942,36.471 63.489,36.471L58.236,36.471ZM79.695,57.667L76.755,57.667L76.755,33.828L79.646,33.828L92.581,52.38L92.845,52.38L92.845,33.828L95.786,33.828L95.786,57.667L92.895,57.667L79.96,39.181L79.695,39.181L79.695,57.667Z"
-        android:strokeColor="#00000000" android:strokeWidth="1"/>
-    <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M32.352,17.396L98.315,17.396A13.956,13.956 0,0 1,112.271 31.352L112.271,58.648A13.956,13.956 0,0 1,98.315 72.604L32.352,72.604A13.956,13.956 0,0 1,18.396 58.648L18.396,31.352A13.956,13.956 0,0 1,32.352 17.396z" android:strokeWidth="2.79124993">
-        <aapt:attr name="android:strokeColor">
-            <gradient android:endX="65.3335" android:endY="72.604"
-                android:startX="65.3335" android:startY="17.396" android:type="linear">
-                <item android:color="#FFE4A9AF" android:offset="0"/>
-                <item android:color="#FFBEB9F5" android:offset="0.3693551"/>
-                <item android:color="#FF3073DB" android:offset="1"/>
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M33.373,18.417L97.294,18.417A13.956,13.956 0,0 1,111.25 32.373L111.25,57.627A13.956,13.956 0,0 1,97.294 71.583L33.373,71.583A13.956,13.956 0,0 1,19.417 57.627L19.417,32.373A13.956,13.956 0,0 1,33.373 18.417z" android:strokeWidth="4.83333333">
-        <aapt:attr name="android:strokeColor">
-            <gradient android:endX="65.333496" android:endY="71.583"
-                android:startX="65.333496" android:startY="18.417" android:type="linear">
-                <item android:color="#FFE4A9AF" android:offset="0"/>
-                <item android:color="#FFBEB9F5" android:offset="0.3693551"/>
-                <item android:color="#FF3073DB" android:offset="1"/>
-            </gradient>
-        </aapt:attr>
-    </path>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8.0959,14.4667L7.1678,14.4667L5.5928,9.9573L6.4834,9.9573L7.6178,13.526L7.6709,13.526L8.7959,9.9573L9.6553,9.9573L8.0959,14.4667ZM10.3469,9.9573L12.1656,9.9573C13.0656,9.9573 13.6813,10.5729 13.6813,11.4823C13.6813,12.376 13.0438,12.9885 12.1313,12.9885L11.1531,12.9885L11.1531,14.4667L10.3469,14.4667L10.3469,9.9573ZM11.1531,10.6323L11.1531,12.3198L11.95,12.3198C12.525,12.3198 12.8625,12.0198 12.8625,11.4823C12.8625,10.9292 12.5344,10.6323 11.9531,10.6323L11.1531,10.6323ZM15.2604,14.4667L14.4823,14.4667L14.4823,9.9573L15.1823,9.9573L17.3948,13.0229L17.4479,13.0229L17.4479,9.9573L18.2229,9.9573L18.2229,14.4667L17.526,14.4667L15.3135,11.3979L15.2604,11.3979L15.2604,14.4667Z"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFF"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M3.25,6.25h18.0333v11.5h-18.0333z"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:strokeColor">
+      <gradient 
+          android:startY="2.247174"
+          android:startX="12.26665"
+          android:endY="21.66872"
+          android:endX="12.26665"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDEA8B4"/>
+        <item android:offset="0.6901921" android:color="#FFACADFF"/>
+        <item android:offset="1" android:color="#FF1B99F8"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>
diff --git a/app/src/lumen/res/layout/fragment_search_toolbar.xml b/app/src/lumen/res/layout/fragment_search_toolbar.xml
index 8c642c869..5406de9cb 100644
--- a/app/src/lumen/res/layout/fragment_search_toolbar.xml
+++ b/app/src/lumen/res/layout/fragment_search_toolbar.xml
@@ -21,23 +21,11 @@
         android:layout_marginEnd="@dimen/toolbar_padding"
         android:layout_weight="1"/>
 
-    <ImageButton
-        android:id="@+id/reader_mode_button"
-        android:layout_width="28dp"
-        android:layout_height="28dp"
-        android:layout_marginEnd="@dimen/toolbar_padding"
-        android:layout_marginRight="@dimen/toolbar_padding"
-        app:srcCompat="@drawable/ic_reader_mode_off"
-        android:background="@color/transparent"
-        android:scaleType="fitXY"
-        android:visibility="gone"
-        tools:visibility="visible"/>
-
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/vpn_panel_button"
-        android:layout_width="26dp"
-        android:layout_height="26dp"
-        android:scaleType="fitXY"
+        android:layout_width="@dimen/toolbar_menu_icon_w"
+        android:layout_height="@dimen/toolbar_menu_icon_h"
+        android:scaleType="centerInside"
         android:layout_gravity="end|right|center_vertical"
         app:srcCompat="@drawable/ic_vpn_on"
         android:background="@color/transparent"
@@ -46,8 +34,8 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/cc_icon"
-        android:layout_width="28dp"
-        android:layout_height="28dp"
+        android:layout_width="@dimen/toolbar_menu_icon_h"
+        android:layout_height="@dimen/toolbar_menu_icon_h"
         app:srcCompat="@drawable/ic_dashboard_on"
         android:background="@color/transparent"
         android:scaleType="fitXY"/>
diff --git a/app/src/lumen/res/layout/search_bar_widget.xml b/app/src/lumen/res/layout/search_bar_widget.xml
index d32117c76..d88477679 100644
--- a/app/src/lumen/res/layout/search_bar_widget.xml
+++ b/app/src/lumen/res/layout/search_bar_widget.xml
@@ -19,7 +19,8 @@
 
     <TextView
         android:id="@+id/title_bar"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
+        android:layout_weight="1"
         android:layout_height="@dimen/title_bar_h"
         android:gravity="start|center_vertical"
         android:hint="@string/url_bar_search_hint"
@@ -30,6 +31,19 @@
         android:singleLine="true"
         android:textColor="#333333"
         android:textColorHint="@color/url_bar_hint_text_color"
-        android:textSize="15sp" />
+        android:textSize="15sp"
+        android:background="@color/accent_color"/>
+
+    <ImageButton
+        android:id="@+id/reader_mode_button"
+        android:layout_width="@dimen/toolbar_menu_icon_w"
+        android:layout_height="@dimen/toolbar_menu_icon_h"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        app:srcCompat="@drawable/ic_reader_mode_off"
+        android:background="@color/transparent"
+        android:scaleType="fitXY"
+        android:visibility="gone"
+        tools:visibility="visible"/>
 
 </LinearLayout>
diff --git a/app/src/lumen/res/values/colors.xml b/app/src/lumen/res/values/colors.xml
index 72523d5ed..4f7c20887 100644
--- a/app/src/lumen/res/values/colors.xml
+++ b/app/src/lumen/res/values/colors.xml
@@ -15,6 +15,7 @@
     <color name="url_bar_text_color_normal">@color/white</color>
     <color name="url_bar_bg_incognito">#464857</color>
     <color name="url_bar_text_color_incognito">@color/white</color>
+    <color name="url_bar_hint_text_color">#9AFFFFFF</color>
     <color name="icon_light_theme">#FFFFFFFF</color>
     <color name="icon_dark_theme">#FF000000</color>
 
diff --git a/app/src/main/java/acr/browser/lightning/view/LightningView.java b/app/src/main/java/acr/browser/lightning/view/LightningView.java
index 68035bdd8..7c09ef7fe 100644
--- a/app/src/main/java/acr/browser/lightning/view/LightningView.java
+++ b/app/src/main/java/acr/browser/lightning/view/LightningView.java
@@ -12,9 +12,6 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.collection.ArrayMap;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,6 +21,10 @@
 import android.webkit.WebSettings.PluginState;
 import android.webkit.WebView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.collection.ArrayMap;
+
 import com.cliqz.browser.antiphishing.AntiPhishing;
 import com.cliqz.browser.app.BrowserApp;
 import com.cliqz.browser.main.FlavoredActivityComponent;
diff --git a/app/src/main/java/com/cliqz/browser/main/TabFragment.java b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
index c15ac7c67..b3b70d581 100644
--- a/app/src/main/java/com/cliqz/browser/main/TabFragment.java
+++ b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
@@ -374,7 +374,6 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
             }
         });
         onPageFinished(null);
-        updateCCIcon();
     }
 
     private void updateVpnIcon() {
@@ -387,11 +386,12 @@ private void updateVpnIcon() {
         }
     }
 
-    private void updateCCIcon() {
+    private void updateCCIcon(boolean isLoadingFinished) {
         if (BuildConfig.IS_LUMEN) {
             if (purchasesManager.isDashboardEnabled() && preferenceManager.getAdBlockEnabled()
                     && preferenceManager.isAttrackEnabled()) {
-                ccIcon.setImageResource(getFlavorDrawable("ic_dashboard_on"));
+                ccIcon.setImageResource(getFlavorDrawable(isLoadingFinished
+                        ? "ic_dashboard_checked" : "ic_dashboard_on"));
             } else {
                 ccIcon.setImageResource(getFlavorDrawable("ic_dashboard_off"));
             }
@@ -497,6 +497,8 @@ public void onResume() {
         queryManager.setForgetMode(mIsIncognito);
         mIsReaderModeOn = false;
         readerModeButton.setImageResource(R.drawable.ic_reader_mode_off);
+        updateCCIcon(progressBar.getProgress() == 100);
+        updateVpnIcon();
     }
 
     @Override
@@ -815,6 +817,7 @@ public void onPageFinished(CliqzMessages.OnPageFinished event) {
                 Log.e(TAG, "Problem reading the file readability.js", e);
             }
         }
+        updateCCIcon(true);
     }
 
     private ValueCallback<String> readabilityCallBack = new ValueCallback<String>() {
@@ -1227,6 +1230,7 @@ public void updateControlIcon(Messages.UpdateControlCenterIcon event) {
             status = event.status;
         }
         ccIcon.setImageLevel(status.ordinal());
+        updateCCIcon(false);
     }
 
     @Subscribe
@@ -1351,7 +1355,7 @@ public void onOrientationChanged(Configuration newConfig) {
 
     @Subscribe
     public void onDashboardStateChange(Messages.onDashboardStateChange message) {
-        updateCCIcon();
+        updateCCIcon(false);
     }
 
     @Subscribe
diff --git a/app/src/main/java/com/cliqz/browser/widget/AutocompleteEditText.java b/app/src/main/java/com/cliqz/browser/widget/AutocompleteEditText.java
index df04ca73b..69757ce7d 100644
--- a/app/src/main/java/com/cliqz/browser/widget/AutocompleteEditText.java
+++ b/app/src/main/java/com/cliqz/browser/widget/AutocompleteEditText.java
@@ -87,7 +87,7 @@ public AutocompleteEditText(Context context, AttributeSet attrs, int defStyleAtt
         setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_TEXT_VARIATION_URI);
         setSelectHandDrawable();
         clearIcon = VectorDrawableCompat.create(
-                context.getResources(), R.drawable.ic_clear_black, null);
+                context.getResources(), R.drawable.ic_clear, null);
         backIcon = AutocompleteBackIcon.create(context);
         setDrawable(false);
     }
@@ -288,7 +288,7 @@ public boolean onTouchEvent(MotionEvent event) {
                 bus.post(new Messages.SearchBarClearPressed());
                 return true;
             } else {
-                return false;
+                return super.onTouchEvent(event);
             }
         } else {
             return super.onTouchEvent(event);
diff --git a/app/src/main/java/com/cliqz/browser/widget/SearchBar.java b/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
index 0415fd2a4..202284239 100644
--- a/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
+++ b/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
@@ -84,6 +84,10 @@ public interface Listener extends TextWatcher, OnFocusChangeListener {
     @Nullable
     Listener mListener;
 
+    @Nullable
+    @BindView(R.id.reader_mode_button)
+    View readerModeButton;
+
     @Inject
     Bus bus;
 
@@ -217,6 +221,10 @@ public void setProgress(int progress) {
         }
     }
 
+    public int getProgress() {
+        return progressBar.getProgress();
+    }
+
     public void setSearchText(String text) {
         searchEditText.setText(text);
     }
@@ -293,11 +301,17 @@ public boolean onInterceptTouchEvent(MotionEvent event) {
         if (event.getAction() != MotionEvent.ACTION_DOWN) {
             return super.onInterceptTouchEvent(event);
         }
+
         if (antiTrackingDetails != null && antiTrackingDetails.getVisibility() == VISIBLE
                 && event.getX() >= antiTrackingDetails.getX()) {
             return super.onInterceptTouchEvent(event);
         }
 
+        if (readerModeButton != null && readerModeButton.getVisibility() == VISIBLE
+                && event.getX() >= readerModeButton.getX()) {
+            return super.onInterceptTouchEvent(event);
+        }
+
         if (titleBar.getVisibility() == VISIBLE) {
             if (antiTrackingDetails != null) {
                 setAntiTrackingDetailsVisibility(GONE);
diff --git a/app/src/main/res/layout/fragment_base.xml b/app/src/main/res/layout/fragment_base.xml
index 046a1f008..826c04e33 100644
--- a/app/src/main/res/layout/fragment_base.xml
+++ b/app/src/main/res/layout/fragment_base.xml
@@ -35,7 +35,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/search_edit_text_h"
                     android:background="#ffffff"
-                    android:drawablePadding="5dp"
+                    android:drawablePadding="12dp"
                     android:focusable="true"
                     android:focusableInTouchMode="true"
                     android:gravity="start|center_vertical"
@@ -43,10 +43,10 @@
                     android:imeActionLabel="@string/go"
                     android:imeOptions="actionGo"
                     android:maxLines="1"
-                    android:paddingEnd="8dp"
-                    android:paddingStart="8dp"
+                    android:paddingEnd="16dp"
+                    android:paddingStart="16dp"
                     android:selectAllOnFocus="true"
-                    android:textColor="#333333"
+                    android:textColor="@color/url_bar_text_color_normal"
                     android:textColorHighlight="@color/text_highlight_color"
                     android:textColorHint="@color/url_bar_hint_text_color"
                     android:textCursorDrawable="@drawable/custom_cursor"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d57514ef7..841086d74 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,5 +17,4 @@
     <color name="secondary_color_settings_dark">#2E2E2E</color>
     <color name="toolbar_icon_color_incognito">#ffffff</color>
     <color name="onboarding_background">#b8dfee</color>
-    <color name="url_bar_hint_text_color">#AAAAAA</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 433c0c538..e1af9acc2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,14 +6,14 @@
     <dimen name="app_defaultsize_h">598.0dp</dimen>
     <dimen name="app_minimumsize_w">632.0dp</dimen>
     <dimen name="app_minimumsize_h">598.0dp</dimen>
-    <dimen name="search_edit_text_h">56.0dp</dimen>
+    <dimen name="search_edit_text_h">46.0dp</dimen>
     <dimen name="toolbar_menu_item_h">36.0dp</dimen>
     <dimen name="toolbar_menu_item_w">36.0dp</dimen>
     <dimen name="toolbar_menu_icon_h">24.0dp</dimen>
     <dimen name="toolbar_menu_icon_w">24.0dp</dimen>
-    <dimen name="toolbar_padding">12.0dp</dimen>
+    <dimen name="toolbar_padding">16.0dp</dimen>
     <dimen name="control_center_layout_w">50.0dp</dimen>
-    <dimen name="title_bar_h">24dp</dimen>
+    <dimen name="title_bar_h">30dp</dimen>
     <dimen name="fallback_logo_text_size">80sp</dimen>
     <dimen name="tab_icon_size">100dp</dimen>
     <dimen name="favorites_side_margins">20dp</dimen>

From e38eb2c7a395a1f63bb863794310007fa644be32 Mon Sep 17 00:00:00 2001
From: Sharath <sharath@cliqz.com>
Date: Thu, 4 Jul 2019 13:24:01 +0200
Subject: [PATCH 14/57] Fix Build Number not being passed to the Container
 (#144)

---
 Jenkinsfile.upload                                     | 7 +++++--
 buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile.upload b/Jenkinsfile.upload
index 99a1e2f3f..9c6cb5a45 100644
--- a/Jenkinsfile.upload
+++ b/Jenkinsfile.upload
@@ -2,7 +2,7 @@
 @Library(['cliqz-shared-library@v1.2']) _
 properties([
     parameters([
-        choice(choices: ['cliqz', 'lumen'], defaultValue: 'lumen', description: 'Which Product ?', name: 'product')
+        choice(choices: ['lumen', 'cliqz'], defaultValue: 'lumen', description: 'Which Product ?', name: 'product')
     ])
 ])
 node('master'){
@@ -23,7 +23,10 @@ node('master'){
                     npm run bundle
                 '''
             }
-            withEnv(["GRADLE_USER_HOME=${pwd()}/gradle_home"]) {
+            withEnv([
+                "GRADLE_USER_HOME=${pwd()}/gradle_home",
+                "BUILD_NUMBER=${BUILD_NUMBER}"
+                ]) {
                 withCredentials([
                         file(credentialsId: '263e59fb-e9de-4e51-962c-0237c6ee167b', variable: 'CERT_PATH'),
                         string(credentialsId: '60354bba-8ed0-4df9-8f8e-5be7454c1680', variable: 'CERT_PASS'),
diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
index 80c2ba62a..2d0c27ce6 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
@@ -56,7 +56,7 @@ class CliqzPlugin: Plugin<Project> {
     private fun setVersionCode(variant: ApplicationVariant) {
         val buildNumber = System.getenv("BUILD_NUMBER")?.toIntOrNull()
         if (buildNumber == null) return;
-        val versionCode = 110 + buildNumber
+        val versionCode = 150 + buildNumber
         val apiVersion = variant.productFlavors[0].versionCode
         variant.outputs.forEach { output ->
             val abi = output.filters.find { it.filterType == OutputFile.ABI }

From f57ff8e95cbb0da54dfcd17f84e0e2dbdac1100f Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Thu, 4 Jul 2019 14:30:20 +0200
Subject: [PATCH 15/57] AP-366 Refactoring Start Tab to resolve rendering
 inconsistencies (#143)

---
 app/build.gradle                              |   3 +
 .../main/FlavoredActivityComponent.java       |   1 -
 .../cliqz/browser/main/HistoryFragment.java   | 146 ++++---------
 .../browser/starttab/StartTabContainer.java   |   8 +-
 .../main/FlavoredActivityComponent.java       |   8 +-
 .../browser/starttab/FavoritesFragment.java   | 177 ----------------
 .../cliqz/browser/starttab/FavoritesView.java | 137 ++++++++++++
 .../browser/starttab/HistoryFragment.java     | 199 ------------------
 .../cliqz/browser/starttab/HistoryView.java   | 100 +++++++++
 .../cliqz/browser/starttab/IconTabLayout.java |  24 ++-
 .../browser/starttab/StartTabAdapter.java     |  68 +++---
 .../browser/starttab/StartTabContainer.java   |  49 ++---
 .../browser/starttab/StartTabFragment.java    |  17 --
 .../com/cliqz/browser/starttab/Updatable.java |   5 +
 .../browser/starttab/freshtab/FreshTab.kt     |  76 +++----
 .../res/layout/starttab_container_layout.xml  |   1 +
 .../cliqz/browser/main/HistoryAdapter.java    | 121 +++++------
 .../com/cliqz/browser/main/TabFragment.java   |   8 +-
 .../cliqz/browser/main/search/SearchView.java |   2 +-
 .../starttab/HistoryItemTouchHelper.java      |  62 ++++++
 .../com/cliqz/browser/widget/SearchBar.java   |  73 +++++--
 21 files changed, 581 insertions(+), 704 deletions(-)
 delete mode 100644 app/src/lumen/java/com/cliqz/browser/starttab/FavoritesFragment.java
 create mode 100644 app/src/lumen/java/com/cliqz/browser/starttab/FavoritesView.java
 delete mode 100644 app/src/lumen/java/com/cliqz/browser/starttab/HistoryFragment.java
 create mode 100644 app/src/lumen/java/com/cliqz/browser/starttab/HistoryView.java
 delete mode 100644 app/src/lumen/java/com/cliqz/browser/starttab/StartTabFragment.java
 create mode 100644 app/src/lumen/java/com/cliqz/browser/starttab/Updatable.java
 create mode 100644 app/src/main/java/com/cliqz/browser/starttab/HistoryItemTouchHelper.java

diff --git a/app/build.gradle b/app/build.gradle
index 38034bf0f..dadce072d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -108,6 +108,9 @@ android {
             universalApk false
         }
     }
+    testOptions {
+        animationsDisabled = true
+    }
 }
 
 dexcount {
diff --git a/app/src/cliqz/java/com/cliqz/browser/main/FlavoredActivityComponent.java b/app/src/cliqz/java/com/cliqz/browser/main/FlavoredActivityComponent.java
index 43e2e2d96..561103300 100644
--- a/app/src/cliqz/java/com/cliqz/browser/main/FlavoredActivityComponent.java
+++ b/app/src/cliqz/java/com/cliqz/browser/main/FlavoredActivityComponent.java
@@ -3,7 +3,6 @@
 import com.cliqz.browser.annotations.PerActivity;
 import com.cliqz.browser.controlcenter.ControlCenterDialog;
 import com.cliqz.browser.main.search.Freshtab;
-import com.cliqz.browser.main.search.Incognito;
 
 import dagger.Subcomponent;
 
diff --git a/app/src/cliqz/java/com/cliqz/browser/main/HistoryFragment.java b/app/src/cliqz/java/com/cliqz/browser/main/HistoryFragment.java
index dc48f01f4..4ed7879dc 100644
--- a/app/src/cliqz/java/com/cliqz/browser/main/HistoryFragment.java
+++ b/app/src/cliqz/java/com/cliqz/browser/main/HistoryFragment.java
@@ -2,24 +2,28 @@
 
 import android.database.Cursor;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.ItemTouchHelper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
-import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.cliqz.browser.R;
+import com.cliqz.browser.app.BrowserApp;
 import com.cliqz.browser.overview.OverviewFragment;
 import com.cliqz.browser.overview.OverviewTabsEnum;
-import com.cliqz.browser.webview.CliqzMessages;
+import com.cliqz.browser.main.HistoryAdapter;
+import com.cliqz.browser.starttab.HistoryItemTouchHelper;
 import com.cliqz.nove.Subscribe;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Objects;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -32,9 +36,8 @@ public class HistoryFragment extends FragmentWithBus {
 
     private boolean isMultiSelect;
     private HistoryAdapter adapter;
-    private final ArrayList<HistoryModel> historyList = new ArrayList<>();
     private View contextualToolBar;
-    private TextView contextualToolBarTitle;
+    // private TextView contextualToolBarTitle;
 
     @BindView(R.id.history_rview)
     RecyclerView historyListView;
@@ -43,11 +46,18 @@ public class HistoryFragment extends FragmentWithBus {
     LinearLayout noHistoryMessage;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        contextualToolBar = ((OverviewFragment)getParentFragment()).contextualToolBar;
-        contextualToolBarTitle = contextualToolBar.findViewById(R.id.contextual_title);
+    public View onCreateView(@NotNull LayoutInflater inflater,
+                             @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        contextualToolBar = Objects
+                .requireNonNull((OverviewFragment)getParentFragment())
+                .contextualToolBar;
+        // contextualToolBarTitle = contextualToolBar.findViewById(R.id.contextual_title);
         final View view = inflater.inflate(R.layout.fragment_history, container, false);
         ButterKnife.bind(this,view);
+        final FlavoredActivityComponent component = BrowserApp.getActivityComponent(getContext());
+        Objects.requireNonNull(component).inject(this);
+        adapter = new HistoryAdapter(engine, handler, bus);
         return view;
     }
 
@@ -62,45 +72,13 @@ public void onStart() {
             preferenceManager.setShouldClearQueries(PreferenceManager.ClearQueriesOptions.NO);
         }*/
         prepareListData();
-        if (historyList.size() == 0) {
+        if (adapter.getItemCount() == 0) {
             noHistoryMessage.setVisibility(View.VISIBLE);
             return;
         }
         noHistoryMessage.setVisibility(View.GONE);
         if (adapter == null) {
-            adapter = new HistoryAdapter(historyList, engine, handler, new HistoryAdapter.ClickListener() {
-                @Override
-                public void onClick(View view, int position) {
-                    //ignore click on date
-                    if (adapter.getItemViewType(position) == HistoryAdapter.VIEW_TYPE_DATE) {
-                        return;
-                    }
-                    if (isMultiSelect) {
-                        multiSelect(position);
-                    } else if (adapter.getItemViewType(position) == HistoryAdapter.VIEW_TYPE_HISTORY) {
-                        bus.post(CliqzMessages.OpenLink.openFromHistory(historyList.get(position).getUrl()));
-                    } else if (adapter.getItemViewType(position) == HistoryAdapter.VIEW_TYPE_QUERY) {
-                        bus.post(new Messages.OpenQuery(historyList.get(position).getUrl()));
-                    }
-                }
-
-                @Override
-                public void onLongPress(View view, int position) {
-                    //if view is being swiped ignore long press
-                    if (view.getTranslationX() != 0) {
-                        return;
-                    }
-                    //ignore long press on date
-                    if (adapter.getItemViewType(position) == HistoryAdapter.VIEW_TYPE_DATE) {
-                        return;
-                    }
-                    if (!isMultiSelect) {
-                        adapter.multiSelectList.clear();
-                        showContextualMenu();
-                    }
-                    multiSelect(position);
-                }
-            });
+            adapter = new HistoryAdapter(engine, handler, bus);
         }
         prepareRecyclerView();
     }
@@ -120,18 +98,25 @@ public void onOverviewTabSwitched(Messages.OnOverviewTabSwitched event) {
 
     @Subscribe
     public void onContextualBarCanceled(Messages.OnContextualBarCancelPressed event) {
-        if (((OverviewFragment)getParentFragment()).getCurrentPageIndex()
-                == OverviewTabsEnum.HISTORY.getFragmentIndex()) {
+        final int pageIndex = Objects
+                .requireNonNull((OverviewFragment)getParentFragment())
+                .getCurrentPageIndex();
+        if (pageIndex == OverviewTabsEnum.HISTORY.getFragmentIndex()) {
             hideContextualMenu();
         }
     }
 
     @Subscribe
     public void onContextualBarDelete(Messages.OnContextualBarDeletePressed event) {
-        if (((OverviewFragment)getParentFragment()).getCurrentPageIndex()
-                == OverviewTabsEnum.HISTORY.getFragmentIndex()) {
+        // TODO restore this
+        /*
+        final int pageIndex = Objects
+                .requireNonNull((OverviewFragment)getParentFragment())
+                .getCurrentPageIndex();
+        if (pageIndex == OverviewTabsEnum.HISTORY.getFragmentIndex()) {
             deleteSelectedItems();
         }
+        */
     }
 
     private void prepareRecyclerView() {
@@ -142,59 +127,17 @@ private void prepareRecyclerView() {
         historyListView.setLayoutManager(new LinearLayoutManager(getContext()));
 
         //callback to handle swipe and delete
-        final ItemTouchHelper.SimpleCallback simpleItemTouchCallback =
-                new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
-
-                    @Override
-                    public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-                        //Dont swipe date view and when contextual menu is enabled
-                        if (viewHolder instanceof HistoryAdapter.DateViewHolder || isMultiSelect) {
-                            return 0;
-                        }
-                        return super.getSwipeDirs(recyclerView, viewHolder);
-                    }
-
-                    @Override
-                    public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder,
-                                          RecyclerView.ViewHolder target) {
-                        return false;
-                    }
-
-                    @Override
-                    public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
-                        final int position = viewHolder.getAdapterPosition();
-                        final int type = viewHolder.getItemViewType();
-                        if (type == HistoryAdapter.VIEW_TYPE_HISTORY) {
-                            historyDatabase.deleteHistoryPoint(historyList.get(position).getId());
-                        } else {
-                            historyDatabase.deleteQuery(historyList.get(position).getId());
-                        }
-                        historyList.remove(position);
-                        adapter.notifyItemRemoved(position);
-                        //check if date view is to be removed
-                        if ((position == historyList.size()
-                                || historyListView.getAdapter().getItemViewType(position) == HistoryAdapter.VIEW_TYPE_DATE)
-                                && historyListView.getAdapter().getItemViewType(position - 1 ) == HistoryAdapter.VIEW_TYPE_DATE) {
-                            historyList.remove(position-1);
-                            adapter.notifyItemRemoved(position-1);
-                            if (historyList.size() == 0) {
-                                noHistoryMessage.setVisibility(View.VISIBLE);
-                            }
-                        }
-                    }
-                };
-
-        //callbacks for click and long click on items
-        final ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleItemTouchCallback);
+        final ItemTouchHelper itemTouchHelper = new ItemTouchHelper(new HistoryItemTouchHelper(historyDatabase, adapter));
         itemTouchHelper.attachToRecyclerView(historyListView);
         historyListView.setAdapter(adapter);
-        historyListView.scrollToPosition(historyList.size()-1);
+        historyListView.scrollToPosition(adapter.getItemCount()-1);
     }
 
     private void prepareListData() {
         //TODO historyDatabase.getHistoryItemsCount has to be modified to get the limit correctly;
-        historyList.clear();
-        final Cursor cursor = historyDatabase.getHistoryItemsForRecyclerView(0, historyDatabase.getHistoryItemsCount());
+        final int itemsCount = historyDatabase.getHistoryItemsCount();
+        final ArrayList<HistoryModel> historyList = new ArrayList<>(itemsCount);
+        final Cursor cursor = historyDatabase.getHistoryItemsForRecyclerView(0, itemsCount);
         final int typeIndex = cursor.getColumnIndex("type");
         final int idIndex = cursor.getColumnIndex("id");
         final int urlIndex = cursor.getColumnIndex("url");
@@ -208,8 +151,10 @@ private void prepareListData() {
                     cursor.getInt(typeIndex)));
         }
         cursor.close();
+        adapter.setHistory(historyList);
     }
 
+    /*
     private void multiSelect(int position) {
             if (adapter.multiSelectList.contains(position)) {
                 adapter.multiSelectList.remove(Integer.valueOf(position));
@@ -257,10 +202,11 @@ private void showContextualMenu() {
             return;
         }
         isMultiSelect = true;
-        getParentFragment().setHasOptionsMenu(false);
+        Objects.requireNonNull(getParentFragment()).setHasOptionsMenu(false);
         setDisplayHomeAsUpEnabled(false);
         contextualToolBar.setVisibility(View.VISIBLE);
     }
+    */
 
     private void hideContextualMenu() {
         //if its already hidden dont execute the next lines
@@ -268,9 +214,9 @@ private void hideContextualMenu() {
             return;
         }
         isMultiSelect = false;
-        adapter.multiSelectList.clear();
+        // adapter.multiSelectList.clear();
         adapter.notifyDataSetChanged();
-        getParentFragment().setHasOptionsMenu(true);
+        Objects.requireNonNull(getParentFragment()).setHasOptionsMenu(true);
         setDisplayHomeAsUpEnabled(true);
         contextualToolBar.setVisibility(View.GONE);
     }
diff --git a/app/src/cliqz/java/com/cliqz/browser/starttab/StartTabContainer.java b/app/src/cliqz/java/com/cliqz/browser/starttab/StartTabContainer.java
index fa33f4c23..c26c51c7c 100644
--- a/app/src/cliqz/java/com/cliqz/browser/starttab/StartTabContainer.java
+++ b/app/src/cliqz/java/com/cliqz/browser/starttab/StartTabContainer.java
@@ -6,12 +6,9 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentManager;
 
 import com.cliqz.browser.main.search.Freshtab;
 
-import acr.browser.lightning.preference.PreferenceManager;
-
 /**
  * @author Ravjit Uppal
  */
@@ -29,10 +26,7 @@ public StartTabContainer(@NonNull Context context, @Nullable AttributeSet attrs)
 
     public StartTabContainer(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-    }
-
-    public void init(FragmentManager supportFragmentManager, PreferenceManager preferenceManager) {
-        mFreshtab = new Freshtab(getContext());
+        mFreshtab = new Freshtab(context);
         addView(mFreshtab);
     }
 
diff --git a/app/src/lumen/java/com/cliqz/browser/main/FlavoredActivityComponent.java b/app/src/lumen/java/com/cliqz/browser/main/FlavoredActivityComponent.java
index fef0b3822..9ab600fc3 100644
--- a/app/src/lumen/java/com/cliqz/browser/main/FlavoredActivityComponent.java
+++ b/app/src/lumen/java/com/cliqz/browser/main/FlavoredActivityComponent.java
@@ -5,8 +5,8 @@
 import com.cliqz.browser.controlcenter.DashboardFragment;
 import com.cliqz.browser.purchases.PurchaseFragment;
 import com.cliqz.browser.purchases.PurchasesManager;
-import com.cliqz.browser.starttab.FavoritesFragment;
-import com.cliqz.browser.starttab.HistoryFragment;
+import com.cliqz.browser.starttab.FavoritesView;
+import com.cliqz.browser.starttab.HistoryView;
 import com.cliqz.browser.starttab.freshtab.FreshTab;
 import com.cliqz.browser.vpn.VpnHandler;
 import com.cliqz.browser.vpn.VpnPanel;
@@ -26,9 +26,9 @@ public interface FlavoredActivityComponent extends MainActivityComponent {
 
     void inject(FreshTab freshTab);
 
-    void inject(HistoryFragment historyFragment);
+    void inject(HistoryView historyView);
 
-    void inject(FavoritesFragment favoritesFragment);
+    void inject(FavoritesView favoritesView);
 
     void inject(PurchaseFragment purchaseFragment);
 
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/FavoritesFragment.java b/app/src/lumen/java/com/cliqz/browser/starttab/FavoritesFragment.java
deleted file mode 100644
index 76a7fe0b2..000000000
--- a/app/src/lumen/java/com/cliqz/browser/starttab/FavoritesFragment.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.cliqz.browser.starttab;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.cliqz.browser.R;
-import com.cliqz.browser.app.BrowserApp;
-import com.cliqz.browser.main.FavoriteModel;
-import com.cliqz.browser.main.FavoritesAdapter;
-import com.cliqz.browser.main.FlavoredActivityComponent;
-import com.cliqz.browser.main.MainActivityHandler;
-import com.cliqz.browser.webview.CliqzMessages;
-import com.cliqz.jsengine.Engine;
-import com.cliqz.nove.Bus;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-
-import javax.inject.Inject;
-
-import acr.browser.lightning.database.HistoryDatabase;
-import butterknife.ButterKnife;
-
-/**
- * @author Ravjit Uppal
- */
-public class FavoritesFragment extends StartTabFragment {
-
-    private static final String TAG = FavoritesFragment.class.getSimpleName();
-    private FavoritesAdapter adapter;
-    private RecyclerView favoritesListView;
-    private final ArrayList<FavoriteModel> favoritesList = new ArrayList<>();
-
-    @Inject
-    Engine engine;
-
-    @Inject
-    MainActivityHandler handler;
-
-    @Inject
-    Bus bus;
-
-    @Inject
-    HistoryDatabase historyDatabase;
-
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        favoritesListView = null;
-        final View view = inflater.inflate(R.layout.fragment_favorite, container, false);
-        ButterKnife.bind(this, view);
-        return view;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        final FlavoredActivityComponent component = BrowserApp.getActivityComponent(getActivity());
-        if (component != null) {
-            component.inject(this);
-        }
-        prepareListData();
-        if (checkNoFavorites()) {
-            return;
-        }
-        if (adapter == null) {
-            adapter = new FavoritesAdapter(favoritesList, engine, handler, new FavoritesAdapter.ClickListener() {
-                @Override
-                public void onClick(View view, int position) {
-                    bus.post(CliqzMessages.OpenLink.open(favoritesList.get(position).getUrl()));
-                }
-
-                @Override
-                public void onLongPress(View view, int position) {
-                }
-            });
-        }
-        prepareRecyclerView();
-    }
-
-    private boolean checkNoFavorites() {
-        return favoritesList.size() == 0;
-    }
-
-    private void prepareRecyclerView() {
-        if (favoritesListView != null) {
-            return;
-        }
-        final View view = getView();
-        if (view == null) {
-            return;
-        }
-        favoritesListView = view.findViewById(R.id.history_rview);
-        favoritesListView.setLayoutManager(new LinearLayoutManager(getContext()));
-
-        //callback to handle swipe and delete
-        final ItemTouchHelper.SimpleCallback simpleItemTouchCallback =
-                new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
-
-                    @Override
-                    public int getSwipeDirs(@NonNull RecyclerView recyclerView,
-                                            @NonNull RecyclerView.ViewHolder viewHolder) {
-                        //Dont swipe when contextual menu is enabled
-                        return super.getSwipeDirs(recyclerView, viewHolder);
-                    }
-
-                    @Override
-                    public boolean onMove(@NonNull RecyclerView recyclerView,
-                                          @NonNull RecyclerView.ViewHolder viewHolder,
-                                          @NonNull RecyclerView.ViewHolder target) {
-                        return false;
-                    }
-
-                    @Override
-                    public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
-                        final int position = viewHolder.getAdapterPosition();
-                        historyDatabase.setFavorites(favoritesList.get(position).getUrl(), null,
-                                System.currentTimeMillis(), false);
-                        favoritesList.remove(position);
-                        adapter.notifyItemRemoved(position);
-                        checkNoFavorites();
-                    }
-                };
-
-        //callbacks for click and long click on items
-        final ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleItemTouchCallback);
-        itemTouchHelper.attachToRecyclerView(favoritesListView);
-        favoritesListView.setAdapter(adapter);
-    }
-
-    private void prepareListData() {
-        favoritesList.clear();
-        final JSONArray favoritesJsonArray = historyDatabase.getFavorites();
-        try {
-            for (int i = 0; i < favoritesJsonArray.length(); i++) {
-                final JSONObject favoriteItem = favoritesJsonArray.getJSONObject(i);
-                favoritesList.add(new FavoriteModel(favoriteItem.optString(HistoryDatabase.HistoryKeys.URL),
-                        favoriteItem.optString(HistoryDatabase.HistoryKeys.TITLE)));
-            }
-        } catch (JSONException e) {
-            Log.e(TAG, "error parsing favorites json", e);
-        }
-    }
-
-    @Override
-    public String getTitle() {
-        return "";
-    }
-
-    @Override
-    public int getIconId() {
-        return R.drawable.ic_star_white;
-    }
-
-    @Override
-    public void updateView() {
-        if (!isAdded() || adapter == null) {
-            return;
-        }
-        prepareListData();
-        adapter.notifyDataSetChanged();
-    }
-}
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/FavoritesView.java b/app/src/lumen/java/com/cliqz/browser/starttab/FavoritesView.java
new file mode 100644
index 000000000..2c23a2ea7
--- /dev/null
+++ b/app/src/lumen/java/com/cliqz/browser/starttab/FavoritesView.java
@@ -0,0 +1,137 @@
+package com.cliqz.browser.starttab;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.cliqz.browser.R;
+import com.cliqz.browser.app.BrowserApp;
+import com.cliqz.browser.main.FavoriteModel;
+import com.cliqz.browser.main.FavoritesAdapter;
+import com.cliqz.browser.main.FlavoredActivityComponent;
+import com.cliqz.browser.main.MainActivityHandler;
+import com.cliqz.browser.webview.CliqzMessages;
+import com.cliqz.jsengine.Engine;
+import com.cliqz.nove.Bus;
+
+import org.jetbrains.annotations.NotNull;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+import javax.inject.Inject;
+
+import acr.browser.lightning.database.HistoryDatabase;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * @author Ravjit Uppal
+ */
+public class FavoritesView extends FrameLayout implements Updatable {
+
+    private static final String TAG = FavoritesView.class.getSimpleName();
+    private FavoritesAdapter adapter;
+    private final ArrayList<FavoriteModel> favoritesList = new ArrayList<>();
+
+    @BindView(R.id.history_rview)
+    RecyclerView favoritesListView;
+
+    @Inject
+    Engine engine;
+
+    @Inject
+    MainActivityHandler handler;
+
+    @Inject
+    Bus bus;
+
+    @Inject
+    HistoryDatabase historyDatabase;
+
+
+    public FavoritesView(@NonNull Context context) {
+        super(context);
+        final View view = LayoutInflater.from(context).inflate(R.layout.fragment_favorite, this);
+        ButterKnife.bind(this, view);
+
+        final FlavoredActivityComponent component = BrowserApp.getActivityComponent(context);
+        if (component != null) {
+            component.inject(this);
+        }
+        prepareListData();
+        adapter = new FavoritesAdapter(favoritesList, engine, handler, new FavoritesAdapter.ClickListener() {
+            @Override
+            public void onClick(View view, int position) {
+                bus.post(CliqzMessages.OpenLink.open(favoritesList.get(position).getUrl()));
+            }
+
+            @Override
+            public void onLongPress(View view, int position) {
+            }
+        });
+
+        favoritesListView.setLayoutManager(new LinearLayoutManager(context));
+        final ItemTouchHelper itemTouchHelper =new ItemTouchHelper(new TouchCallback());
+        itemTouchHelper.attachToRecyclerView(favoritesListView);
+        favoritesListView.setAdapter(adapter);
+    }
+
+    @Override
+    public void update() {
+        prepareListData();
+        adapter.notifyDataSetChanged();
+    }
+
+    private void prepareListData() {
+        favoritesList.clear();
+        final JSONArray favoritesJsonArray = historyDatabase.getFavorites();
+        try {
+            for (int i = 0; i < favoritesJsonArray.length(); i++) {
+                final JSONObject favoriteItem = favoritesJsonArray.getJSONObject(i);
+                favoritesList.add(new FavoriteModel(favoriteItem.optString(HistoryDatabase.HistoryKeys.URL),
+                        favoriteItem.optString(HistoryDatabase.HistoryKeys.TITLE)));
+            }
+        } catch (JSONException e) {
+            Log.e(TAG, "error parsing favorites json", e);
+        }
+    }
+
+    private class TouchCallback extends ItemTouchHelper.SimpleCallback {
+        TouchCallback() {
+            super(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);
+        }
+
+        @Override
+        public int getSwipeDirs(@NonNull RecyclerView recyclerView,
+                                @NonNull RecyclerView.ViewHolder viewHolder) {
+            //Dont swipe when contextual menu is enabled
+            return super.getSwipeDirs(recyclerView, viewHolder);
+        }
+
+        @Override
+        public boolean onMove(@NonNull RecyclerView recyclerView,
+                              @NonNull RecyclerView.ViewHolder viewHolder,
+                              @NonNull RecyclerView.ViewHolder target) {
+            return false;
+        }
+
+        @Override
+        public void onSwiped(@NotNull RecyclerView.ViewHolder viewHolder, int direction) {
+            final int position = viewHolder.getAdapterPosition();
+            historyDatabase.setFavorites(favoritesList.get(position).getUrl(), null,
+                    System.currentTimeMillis(), false);
+            favoritesList.remove(position);
+            adapter.notifyItemRemoved(position);
+        }
+    }
+}
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/HistoryFragment.java b/app/src/lumen/java/com/cliqz/browser/starttab/HistoryFragment.java
deleted file mode 100644
index 34c7f210b..000000000
--- a/app/src/lumen/java/com/cliqz/browser/starttab/HistoryFragment.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package com.cliqz.browser.starttab;
-
-import android.database.Cursor;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.cliqz.browser.R;
-import com.cliqz.browser.app.BrowserApp;
-import com.cliqz.browser.main.FlavoredActivityComponent;
-import com.cliqz.browser.main.HistoryAdapter;
-import com.cliqz.browser.main.HistoryModel;
-import com.cliqz.browser.main.MainActivityHandler;
-import com.cliqz.browser.main.Messages;
-import com.cliqz.browser.webview.CliqzMessages;
-import com.cliqz.jsengine.Engine;
-import com.cliqz.nove.Bus;
-
-import java.util.ArrayList;
-
-import javax.inject.Inject;
-
-import acr.browser.lightning.database.HistoryDatabase;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * @author Stefano Pacifici
- * @author Ravjit Singh
- */
-public class HistoryFragment extends StartTabFragment {
-
-    private final ArrayList<HistoryModel> historyList = new ArrayList<>();
-    private HistoryAdapter adapter;
-
-    @BindView(R.id.history_rview)
-    RecyclerView historyListView;
-
-    @Inject
-    Engine engine;
-
-    @Inject
-    MainActivityHandler handler;
-
-    @Inject
-    Bus bus;
-
-    @Inject
-    HistoryDatabase historyDatabase;
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        final FlavoredActivityComponent component = BrowserApp.getActivityComponent(getActivity());
-        if (component != null) {
-            component.inject(this);
-        }
-        prepareListData();
-        if (historyList.size() == 0) {
-            return;
-        }
-        if (adapter == null) {
-            adapter = new HistoryAdapter(historyList, engine, handler, new HistoryAdapter.ClickListener() {
-                @Override
-                public void onClick(View view, int position) {
-                    //ignore click on date
-                    if (adapter.getItemViewType(position) == HistoryAdapter.VIEW_TYPE_DATE) {
-                        return;
-                    }
-                    if (adapter.getItemViewType(position) == HistoryAdapter.VIEW_TYPE_HISTORY) {
-                        bus.post(CliqzMessages.OpenLink.openFromHistory(historyList.get(position).getUrl()));
-                    } else if (adapter.getItemViewType(position) == HistoryAdapter.VIEW_TYPE_QUERY) {
-                        bus.post(new Messages.OpenQuery(historyList.get(position).getUrl()));
-                    }
-                }
-
-                @Override
-                public void onLongPress(View view, int position) {
-
-                }
-            });
-        }
-        prepareRecyclerView();
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        final View view = inflater.inflate(R.layout.fragment_history, container, false);
-        ButterKnife.bind(this, view);
-        return view;
-    }
-
-    private void prepareRecyclerView() {
-        final View view = getView();
-        if (view == null) {
-            return;
-        }
-        historyListView.setLayoutManager(new LinearLayoutManager(getContext()));
-
-        //callback to handle swipe and delete
-        final ItemTouchHelper.SimpleCallback simpleItemTouchCallback =
-                new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
-
-                    @Override
-                    public int getSwipeDirs(@NonNull RecyclerView recyclerView,
-                                            @NonNull RecyclerView.ViewHolder viewHolder) {
-                        //Dont swipe date view and when contextual menu is enabled
-                        if (viewHolder instanceof HistoryAdapter.DateViewHolder) {
-                            return 0;
-                        }
-                        return super.getSwipeDirs(recyclerView, viewHolder);
-                    }
-
-                    @Override
-                    public boolean onMove(@NonNull RecyclerView recyclerView,
-                                          @NonNull RecyclerView.ViewHolder viewHolder,
-                                          @NonNull RecyclerView.ViewHolder target) {
-                        return false;
-                    }
-
-                    @Override
-                    public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
-                        final int position = viewHolder.getAdapterPosition();
-                        final int type = viewHolder.getItemViewType();
-                        if (type == HistoryAdapter.VIEW_TYPE_HISTORY) {
-                            historyDatabase.deleteHistoryPoint(historyList.get(position).getId());
-                        } else {
-                            historyDatabase.deleteQuery(historyList.get(position).getId());
-                        }
-                        historyList.remove(position);
-                        adapter.notifyItemRemoved(position);
-                        //check if date view is to be removed
-                        if ((position == historyList.size()
-                                || adapter.getItemViewType(position) == HistoryAdapter.VIEW_TYPE_DATE)
-                                && adapter.getItemViewType(position - 1 ) == HistoryAdapter.VIEW_TYPE_DATE) {
-                            historyList.remove(position-1);
-                            adapter.notifyItemRemoved(position-1);
-                        }
-                    }
-                };
-
-        //callbacks for click and long click on items
-        final ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleItemTouchCallback);
-        itemTouchHelper.attachToRecyclerView(historyListView);
-        historyListView.setAdapter(adapter);
-        historyListView.scrollToPosition(historyList.size()-1);
-    }
-
-    private void prepareListData() {
-        //TODO historyDatabase.getHistoryItemsCount has to be modified to get the limit correctly;
-        historyList.clear();
-        final Cursor cursor = historyDatabase.getHistoryItemsForRecyclerView(0, historyDatabase.getHistoryItemsCount());
-        final int typeIndex = cursor.getColumnIndex("type");
-        final int idIndex = cursor.getColumnIndex("id");
-        final int urlIndex = cursor.getColumnIndex("url");
-        final int titleIndex = cursor.getColumnIndex("title");
-        final int timeIndex = cursor.getColumnIndex("date");
-        while (cursor.moveToNext()) {
-            if (cursor.getInt(typeIndex) != HistoryAdapter.VIEW_TYPE_QUERY) {
-                historyList.add(new HistoryModel(cursor.getInt(idIndex),
-                        cursor.getString(urlIndex),
-                        cursor.getString(titleIndex),
-                        cursor.getString(timeIndex),
-                        cursor.getInt(typeIndex)));
-            }
-        }
-        cursor.close();
-    }
-
-    @Override
-    public String getTitle() {
-        return "";
-    }
-
-    @Override
-    public int getIconId() {
-        return R.drawable.ic_history_white;
-    }
-
-    @Override
-    public void updateView() {
-        if (!isAdded() || adapter == null) {
-            return;
-        }
-        prepareListData();
-        adapter.notifyDataSetChanged();
-        historyListView.scrollToPosition(0);
-    }
-}
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/HistoryView.java b/app/src/lumen/java/com/cliqz/browser/starttab/HistoryView.java
new file mode 100644
index 000000000..af596a7fa
--- /dev/null
+++ b/app/src/lumen/java/com/cliqz/browser/starttab/HistoryView.java
@@ -0,0 +1,100 @@
+package com.cliqz.browser.starttab;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.cliqz.browser.R;
+import com.cliqz.browser.app.BrowserApp;
+import com.cliqz.browser.main.FlavoredActivityComponent;
+import com.cliqz.browser.main.HistoryAdapter;
+import com.cliqz.browser.main.HistoryModel;
+import com.cliqz.browser.main.MainActivityHandler;
+import com.cliqz.jsengine.Engine;
+import com.cliqz.nove.Bus;
+
+import java.util.ArrayList;
+
+import javax.inject.Inject;
+
+import acr.browser.lightning.database.HistoryDatabase;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * @author Stefano Pacifici
+ * @author Ravjit Singh
+ */
+public class HistoryView extends FrameLayout implements Updatable {
+
+    private final HistoryAdapter adapter;
+
+    @BindView(R.id.history_rview)
+    RecyclerView historyListView;
+
+    @Inject
+    Engine engine;
+
+    @Inject
+    MainActivityHandler handler;
+
+    @Inject
+    Bus bus;
+
+    @Inject
+    HistoryDatabase historyDatabase;
+
+    public HistoryView(@NonNull Context context) {
+        super(context);
+        final View view = LayoutInflater.from(context).inflate(R.layout.fragment_history, this);
+        ButterKnife.bind(this, view);
+        final FlavoredActivityComponent component = BrowserApp.getActivityComponent(context);
+        if (component != null) {
+            component.inject(this);
+        }
+        adapter = new HistoryAdapter(engine, handler, bus);
+        historyListView.setLayoutManager(new LinearLayoutManager(getContext()));
+        //callbacks for click and long click on items
+        final ItemTouchHelper itemTouchHelper =
+                new ItemTouchHelper(new HistoryItemTouchHelper(historyDatabase, adapter));
+        itemTouchHelper.attachToRecyclerView(historyListView);
+        historyListView.scrollToPosition(0);
+        historyListView.setAdapter(adapter);
+        prepareListData();
+    }
+
+    private void prepareListData() {
+        //TODO historyDatabase.getHistoryItemsCount has to be modified to get the limit correctly;
+        final Cursor cursor = historyDatabase.getHistoryItemsForRecyclerView(0, historyDatabase.getHistoryItemsCount());
+        final int typeIndex = cursor.getColumnIndex("type");
+        final int idIndex = cursor.getColumnIndex("id");
+        final int urlIndex = cursor.getColumnIndex("url");
+        final int titleIndex = cursor.getColumnIndex("title");
+        final int timeIndex = cursor.getColumnIndex("date");
+        final ArrayList<HistoryModel> history = new ArrayList<>(cursor.getCount());
+        while (cursor.moveToNext()) {
+            if (cursor.getInt(typeIndex) != HistoryAdapter.VIEW_TYPE_QUERY) {
+                history.add(new HistoryModel(cursor.getInt(idIndex),
+                        cursor.getString(urlIndex),
+                        cursor.getString(titleIndex),
+                        cursor.getString(timeIndex),
+                        cursor.getInt(typeIndex)));
+            }
+        }
+        cursor.close();
+        adapter.setHistory(history);
+    }
+
+    @Override
+    public void update() {
+        prepareListData();
+        historyListView.scrollToPosition(0);
+    }
+}
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/IconTabLayout.java b/app/src/lumen/java/com/cliqz/browser/starttab/IconTabLayout.java
index 952f54785..0c58ec89e 100644
--- a/app/src/lumen/java/com/cliqz/browser/starttab/IconTabLayout.java
+++ b/app/src/lumen/java/com/cliqz/browser/starttab/IconTabLayout.java
@@ -3,13 +3,15 @@
 import android.content.Context;
 import android.util.AttributeSet;
 
+import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
 import com.google.android.material.tabs.TabLayout;
 
+import java.util.Objects;
+
 /**
  * @author Ravjit Uppal
  *
@@ -18,12 +20,10 @@
  */
 public class IconTabLayout extends TabLayout {
 
-    abstract static class ImageFragmentPagerAdapter extends FragmentPagerAdapter {
-
-        ImageFragmentPagerAdapter(FragmentManager fm) {
-            super(fm);
-        }
+    abstract static class ImagePagerAdapter extends PagerAdapter {
 
+        @SuppressWarnings("WeakerAccess")
+        @DrawableRes
         public abstract int getIcon(int position);
     }
 
@@ -42,9 +42,15 @@ public IconTabLayout(Context context, AttributeSet attrs, int defStyleAttr) {
     @Override
     public void setupWithViewPager(@Nullable ViewPager viewPager) {
         super.setupWithViewPager(viewPager);
+        final ImagePagerAdapter adapter =
+                viewPager != null ? (ImagePagerAdapter) viewPager.getAdapter() : null;
+        if (adapter == null) {
+            return;
+        }
         for (int i = 0; i < getTabCount(); i++) {
-            getTabAt(i).setText("");
-            getTabAt(i).setIcon(((ImageFragmentPagerAdapter)viewPager.getAdapter()).getIcon(i));
+            final TabLayout.Tab tab = Objects.requireNonNull(getTabAt(i));
+            tab.setText("");
+            tab.setIcon(adapter.getIcon(i));
         }
     }
 }
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/StartTabAdapter.java b/app/src/lumen/java/com/cliqz/browser/starttab/StartTabAdapter.java
index 5b15fb27f..c6af8d5da 100644
--- a/app/src/lumen/java/com/cliqz/browser/starttab/StartTabAdapter.java
+++ b/app/src/lumen/java/com/cliqz/browser/starttab/StartTabAdapter.java
@@ -1,56 +1,66 @@
 package com.cliqz.browser.starttab;
 
-import androidx.annotation.DrawableRes;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentManager;
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
 
-import com.cliqz.browser.starttab.freshtab.FreshTab;
-
-import java.util.ArrayList;
+import androidx.annotation.NonNull;
 
-import acr.browser.lightning.preference.PreferenceManager;
+import com.cliqz.browser.R;
+import com.cliqz.browser.starttab.freshtab.FreshTab;
 
 /**
  * @author Ravjit Uppal
  */
-public class StartTabAdapter extends IconTabLayout.ImageFragmentPagerAdapter {
+public class StartTabAdapter extends IconTabLayout.ImagePagerAdapter {
 
-    private final ArrayList<StartTabFragment> mFragments = new ArrayList<>();
+    private final View[] views;
+    private final int[] icons = new int[] {
+            R.drawable.ic_fresh_tab,
+            R.drawable.ic_history_white,
+            R.drawable.ic_star_white
+    };
+    StartTabAdapter(@NonNull Context context) {
+        views = new View[] {
+                new FreshTab(context),
+                new HistoryView(context),
+                new FavoritesView(context)
+        };
+    }
 
-    StartTabAdapter(FragmentManager fm, PreferenceManager preferenceManager) {
-        super(fm);
-        mFragments.clear();
-        boolean isFreshInstall = preferenceManager.getIsFreshInstall();
-        if (isFreshInstall) {
-            preferenceManager.setIsFreshInstall(false);
-        }
-        mFragments.add(FreshTab.newInstance(isFreshInstall));
-        mFragments.add(new HistoryFragment());
-        mFragments.add(new FavoritesFragment());
+    @NonNull
+    @Override
+    public Object instantiateItem(@NonNull ViewGroup container, int position) {
+        final View view = views[position];
+        container.addView(view);
+        return view;
     }
 
     @Override
-    public StartTabFragment getItem(int i) {
-        return mFragments.get(i);
+    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
+        final View view = views[position];
+        container.removeView(view);
     }
 
     @Override
     public int getCount() {
-        return mFragments.size();
+        return views.length;
     }
 
-    @Nullable
     @Override
-    public CharSequence getPageTitle(int position) {
-        return getItem(position).getTitle();
+    public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
+        return view.equals(object);
     }
 
-    @DrawableRes
+    @Override
     public int getIcon(int position) {
-        return getItem(position).getIconId();
+        return icons[position];
     }
 
     void updateView(int position) {
-        mFragments.get(position).updateView();
+        final View view = views[position];
+        if (view instanceof Updatable) {
+            ((Updatable) view).update();
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/StartTabContainer.java b/app/src/lumen/java/com/cliqz/browser/starttab/StartTabContainer.java
index e587c26b7..f6b01068d 100644
--- a/app/src/lumen/java/com/cliqz/browser/starttab/StartTabContainer.java
+++ b/app/src/lumen/java/com/cliqz/browser/starttab/StartTabContainer.java
@@ -8,20 +8,28 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.viewpager.widget.ViewPager;
 
 import com.cliqz.browser.R;
+import com.google.android.material.tabs.TabLayout;
 
 import acr.browser.lightning.preference.PreferenceManager;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnPageChange;
 
 /**
  * @author Ravjit Uppal
  */
-public class StartTabContainer extends FrameLayout implements ViewPager.OnPageChangeListener {
+public class StartTabContainer extends FrameLayout {
 
-    private ViewPager mViewPager;
-    private StartTabAdapter mStartTabAdapter;
+    @BindView(R.id.view_pager)
+    ViewPager mViewPager;
+
+    private final StartTabAdapter mStartTabAdapter;
 
     public StartTabContainer(@NonNull Context context) {
         this(context, null);
@@ -33,41 +41,30 @@ public StartTabContainer(@NonNull Context context, @Nullable AttributeSet attrs)
 
     public StartTabContainer(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        final LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        final View view = inflater.inflate(R.layout.starttab_container_layout, null);
-        addView(view);
-    }
-
-    public void updateFreshTab() {
-    }
-
-    public void init(FragmentManager supportFragmentManager, PreferenceManager preferenceManager) {
-        mViewPager = findViewById(R.id.view_pager);
-        mViewPager.addOnPageChangeListener(this);
-        mStartTabAdapter = new StartTabAdapter(supportFragmentManager, preferenceManager);
+        final LayoutInflater inflater = LayoutInflater.from(context);
+        final View view = inflater.inflate(R.layout.starttab_container_layout, this);
+        ButterKnife.bind(this, view);
+        mStartTabAdapter = new StartTabAdapter(context);
         final IconTabLayout pagerTabStrip = findViewById(R.id.tab_layout);
         mViewPager.setAdapter(mStartTabAdapter);
         pagerTabStrip.setupWithViewPager(mViewPager);
     }
 
+    public void updateFreshTab() {
+        mViewPager.setCurrentItem(mViewPager.getCurrentItem());
+        mStartTabAdapter.updateView(mViewPager.getCurrentItem());
+    }
+
     @Override
     public void setVisibility(int visibility) {
         super.setVisibility(visibility);
         if (visibility == VISIBLE) {
-            mStartTabAdapter.updateView(mViewPager.getCurrentItem());
+            // mStartTabAdapter.updateView(mViewPager.getCurrentItem());
         }
     }
 
-    @Override
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-    }
-
-    @Override
-    public void onPageSelected(int position) {
+    @OnPageChange(R.id.view_pager)
+    void onPageChange(int position) {
         mStartTabAdapter.updateView(position);
     }
-
-    @Override
-    public void onPageScrollStateChanged(int state) {
-    }
 }
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/StartTabFragment.java b/app/src/lumen/java/com/cliqz/browser/starttab/StartTabFragment.java
deleted file mode 100644
index e13ec8bb0..000000000
--- a/app/src/lumen/java/com/cliqz/browser/starttab/StartTabFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.cliqz.browser.starttab;
-
-import androidx.annotation.DrawableRes;
-import androidx.fragment.app.Fragment;
-
-/**
- * @author Ravjit Uppal
- */
-abstract public class StartTabFragment extends Fragment {
-
-    abstract public String getTitle();
-
-    abstract @DrawableRes
-    public int getIconId();
-
-    abstract public void updateView();
-}
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/Updatable.java b/app/src/lumen/java/com/cliqz/browser/starttab/Updatable.java
new file mode 100644
index 000000000..007259799
--- /dev/null
+++ b/app/src/lumen/java/com/cliqz/browser/starttab/Updatable.java
@@ -0,0 +1,5 @@
+package com.cliqz.browser.starttab;
+
+public interface Updatable {
+    void update();
+}
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/freshtab/FreshTab.kt b/app/src/lumen/java/com/cliqz/browser/starttab/freshtab/FreshTab.kt
index f34ce0e90..ca24265fd 100644
--- a/app/src/lumen/java/com/cliqz/browser/starttab/freshtab/FreshTab.kt
+++ b/app/src/lumen/java/com/cliqz/browser/starttab/freshtab/FreshTab.kt
@@ -1,31 +1,34 @@
 package com.cliqz.browser.starttab.freshtab
 
 import acr.browser.lightning.preference.PreferenceManager
-import android.os.Bundle
+import android.content.Context
+import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.view.animation.ScaleAnimation
 import android.widget.AdapterView
+import android.widget.FrameLayout
 import com.cliqz.browser.R
 import com.cliqz.browser.app.BrowserApp
 import com.cliqz.browser.main.Messages
 import com.cliqz.browser.main.search.TopsitesAdapter
 import com.cliqz.browser.purchases.PurchasesManager
-import com.cliqz.browser.starttab.StartTabFragment
+import com.cliqz.browser.starttab.Updatable
 import com.cliqz.browser.telemetry.Telemetry
 import com.cliqz.browser.webview.CliqzMessages
 import com.cliqz.browser.webview.Topsite
 import com.cliqz.nove.Bus
 import com.cliqz.nove.Subscribe
-import kotlinx.android.synthetic.lumen.fragment_freshtab.*
-import kotlinx.android.synthetic.lumen.fragment_freshtab_trial_over_msg.*
-import kotlinx.android.synthetic.lumen.fragment_freshtab_trial_upgrade_msg.*
+import kotlinx.android.synthetic.lumen.fragment_freshtab.view.*
+import kotlinx.android.synthetic.lumen.fragment_freshtab_trial_over_msg.view.*
+import kotlinx.android.synthetic.lumen.fragment_freshtab_trial_upgrade_msg.view.*
 import javax.inject.Inject
 
 private const val SEVEN_DAYS_IN_MILLIS = 604800000L
 
-internal class FreshTab : StartTabFragment() {
+internal class FreshTab
+    @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleRes: Int = 0) :
+        FrameLayout(context, attrs, defStyleRes), Updatable {
 
     private var isFreshInstall: Boolean = false
 
@@ -44,30 +47,11 @@ internal class FreshTab : StartTabFragment() {
     @Inject
     lateinit var telemetry: Telemetry
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        isFreshInstall = arguments?.getBoolean(ARG_IS_FRESH_INSTALL) ?: false
-        BrowserApp.getActivityComponent(activity)?.inject(this)
-        return inflater.inflate(R.layout.fragment_freshtab, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        initializeViews()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        bus.register(this)
-        updateView()
-    }
+    init {
+        BrowserApp.getActivityComponent(context)?.inject(this)
+        isFreshInstall = preferenceManager.isFreshInstall
+        LayoutInflater.from(context).inflate(R.layout.fragment_freshtab, this)
 
-    override fun onPause() {
-        super.onPause()
-        bus.unregister(this)
-    }
-
-    private fun initializeViews() {
         topsites_grid.adapter = topsitesAdapter
         topsites_grid.onItemClickListener = AdapterView.OnItemClickListener { _, view, position, _ ->
             if (topsitesAdapter.getItemViewType(position) == TopsitesAdapter.PLACEHOLDER_TYPE) {
@@ -91,6 +75,17 @@ internal class FreshTab : StartTabFragment() {
         }
     }
 
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        bus.register(this)
+        update()
+    }
+
+    override fun onDetachedFromWindow() {
+        bus.unregister(this)
+        super.onDetachedFromWindow()
+    }
+
     @Subscribe
     fun getTrialPeriod(onTrialPeriodResponse: Messages.OnTrialPeriodResponse) {
         if (purchasesManager.purchase.isASubscriber) return
@@ -108,14 +103,7 @@ internal class FreshTab : StartTabFragment() {
         }
     }
 
-    override fun getTitle() = ""
-
-    override fun getIconId() = R.drawable.ic_fresh_tab
-
-    override fun updateView() {
-        if (!isAdded) {
-            return
-        }
+    override fun update() {
         topsitesAdapter.fetchTopsites()
         toggleTopSitesView(show = preferenceManager.shouldShowTopSites() && !topsitesAdapter.isEmpty)
         toggleWelcomeMessage(show = isFreshInstall && topsitesAdapter.isEmpty)
@@ -162,16 +150,4 @@ internal class FreshTab : StartTabFragment() {
             hideAllTrialPeriodViews()
         }
     }
-
-    companion object {
-
-        const val ARG_IS_FRESH_INSTALL = "is_fresh_install"
-
-        @JvmStatic
-        fun newInstance(isFreshInstall: Boolean) = FreshTab().apply{
-            arguments = Bundle().apply {
-                putBoolean(ARG_IS_FRESH_INSTALL, isFreshInstall)
-            }
-        }
-    }
 }
diff --git a/app/src/lumen/res/layout/starttab_container_layout.xml b/app/src/lumen/res/layout/starttab_container_layout.xml
index e15e99387..7de003042 100644
--- a/app/src/lumen/res/layout/starttab_container_layout.xml
+++ b/app/src/lumen/res/layout/starttab_container_layout.xml
@@ -5,6 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
+    <!-- <com.cliqz.browser.starttab.IconTabLayout -->
     <com.cliqz.browser.starttab.IconTabLayout
         android:id="@+id/tab_layout"
         android:layout_width="match_parent"
diff --git a/app/src/main/java/com/cliqz/browser/main/HistoryAdapter.java b/app/src/main/java/com/cliqz/browser/main/HistoryAdapter.java
index 94f2fd866..e48f84afe 100644
--- a/app/src/main/java/com/cliqz/browser/main/HistoryAdapter.java
+++ b/app/src/main/java/com/cliqz/browser/main/HistoryAdapter.java
@@ -2,17 +2,22 @@
 
 import android.os.Build;
 import android.os.Handler;
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.cliqz.browser.R;
-import com.cliqz.browser.main.search.IconViewHolder;
 import com.cliqz.browser.main.search.FreshtabGetLogoCallback;
+import com.cliqz.browser.main.search.IconViewHolder;
+import com.cliqz.browser.webview.CliqzMessages;
 import com.cliqz.jsengine.Engine;
+import com.cliqz.nove.Bus;
+
+import org.jetbrains.annotations.NotNull;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -24,40 +29,35 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-
-/**
- * @author vishnu
- * @author Ravjit Singh
- */
 public class HistoryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-    public interface ClickListener {
-        void onClick(View view, int position);
-
-        void onLongPress(View view, int position);
-    }
-
     public static final int VIEW_TYPE_DATE = 0;
     public static final int VIEW_TYPE_HISTORY = 1;
     public static final int VIEW_TYPE_QUERY = 2;
+    private final Bus bus;
+    private final Engine engine;
+    private final Handler handler;
 
     private ArrayList<HistoryModel> historyList;
-    private Engine engine;
-    private Handler handler;
 
-    ArrayList<Integer> multiSelectList = new ArrayList<>();
-    private ClickListener clickListener;
+    // private ArrayList<Integer> multiSelectList = new ArrayList<>();
 
-    public HistoryAdapter(ArrayList<HistoryModel> historyList, Engine engine, Handler handler,
-                          ClickListener clickListener) {
-        this.historyList = historyList;
+    public HistoryAdapter(Engine engine, Handler handler,
+                   Bus bus) {
+        this.historyList = new ArrayList<>();
         this.engine = engine;
         this.handler = handler;
-        this.clickListener = clickListener;
+        this.bus = bus;
+    }
+
+    public void setHistory(ArrayList<HistoryModel> history) {
+        historyList = history;
+        notifyDataSetChanged();
     }
 
+    @NotNull
     @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    public RecyclerView.ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
         final View view;
         switch (viewType) {
             case VIEW_TYPE_HISTORY:
@@ -73,14 +73,12 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType
                         parent, false);
                 return new QueryViewHolder(view);
             default:
-                //should never be this case
-                return null;
+                throw new RuntimeException("Unknown type");
         }
     }
 
     @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-
+    public void onBindViewHolder(@NotNull RecyclerView.ViewHolder holder, int position) {
         String visitedTime = null;
         String visitedDate = null;
         final Locale defaultLocale = Locale.getDefault();
@@ -121,11 +119,6 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                 }
                 historyViewHolder.time.setText(visitedTime);
                 loadIcon(historyViewHolder, historyList.get(position).getUrl());
-                if (multiSelectList.contains(position)) {
-                    historyViewHolder.selectedOverlay.setBackgroundColor(0x7700AEF0);
-                } else {
-                    historyViewHolder.selectedOverlay.setBackgroundColor(0x00000000);
-                }
                 break;
             case VIEW_TYPE_DATE:
                 final DateViewHolder dateViewHolder = (DateViewHolder) holder;
@@ -135,11 +128,6 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                 final QueryViewHolder queryViewHolder = (QueryViewHolder) holder;
                 queryViewHolder.query.setText(historyList.get(position).getUrl());
                 queryViewHolder.time.setText(visitedTime);
-                if (multiSelectList.contains(position)) {
-                    queryViewHolder.selectedOverlay.setBackgroundColor(0x7700AEF0);
-                } else {
-                    queryViewHolder.selectedOverlay.setBackgroundColor(0x00000000);
-                }
                 break;
         }
     }
@@ -158,6 +146,19 @@ private void loadIcon(final HistoryViewHolder holder, String url) {
         engine.callAction("getLogoDetails", new FreshtabGetLogoCallback(holder, handler, false), url);
     }
 
+    public long getHistoryId(int position) {
+        return historyList.get(position).getId();
+    }
+
+    public long getQueryId(int position) {
+        return historyList.get(position).getId();
+    }
+
+    public void remove(int position) {
+        historyList.remove(position);
+        notifyItemRemoved(position);
+    }
+
     private class HistoryViewHolder extends IconViewHolder {
 
         public TextView url;
@@ -173,17 +174,17 @@ private class HistoryViewHolder extends IconViewHolder {
             time = view.findViewById(R.id.history_time);
             selectedOverlay = view.findViewById(R.id.selectedOverLay);
             historyViewParent = view.findViewById(R.id.history_view_parent);
-            historyViewParent.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    clickListener.onClick(v, getAdapterPosition());
-                }
-            });
-            historyViewParent.setOnLongClickListener(new View.OnLongClickListener() {
-                @Override
-                public boolean onLongClick(View v) {
-                    clickListener.onLongPress(v, getAdapterPosition());
-                    return true;
+            historyViewParent.setOnClickListener( v -> {
+                final int position = getAdapterPosition();
+                switch (HistoryAdapter.this.getItemViewType(position)) {
+                    case VIEW_TYPE_HISTORY:
+                        bus.post(CliqzMessages.OpenLink.openFromHistory(historyList.get(position).getUrl()));
+                        break;
+                    case VIEW_TYPE_QUERY:
+                        bus.post(new Messages.OpenQuery(historyList.get(position).getUrl()));
+                        break;
+                    default:
+                        break;
                 }
             });
         }
@@ -214,19 +215,19 @@ private class QueryViewHolder extends RecyclerView.ViewHolder {
             time = view.findViewById(R.id.query_time);
             selectedOverlay = view.findViewById(R.id.selectedOverLay);
             queryViewParent = view.findViewById(R.id.query_view_parent);
-            queryViewParent.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    clickListener.onClick(v, getAdapterPosition());
-                }
-            });
-            queryViewParent.setOnLongClickListener(new View.OnLongClickListener() {
-                @Override
-                public boolean onLongClick(View v) {
-                    clickListener.onLongPress(v, getAdapterPosition());
-                    return true;
-                }
-            });
+//            queryViewParent.setOnClickListener(new View.OnClickListener() {
+//                @Override
+//                public void onClick(View v) {
+//                    clickListener.onClick(v, getAdapterPosition());
+//                }
+//            });
+//            queryViewParent.setOnLongClickListener(new View.OnLongClickListener() {
+//                @Override
+//                public boolean onLongClick(View v) {
+//                    clickListener.onLongPress(v, getAdapterPosition());
+//                    return true;
+//                }
+//            });
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cliqz/browser/main/TabFragment.java b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
index b3b70d581..86b82afd3 100644
--- a/app/src/main/java/com/cliqz/browser/main/TabFragment.java
+++ b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
@@ -104,10 +104,6 @@
 import butterknife.OnEditorAction;
 import butterknife.Optional;
 
-/**
- * @author Stefano Pacifici
- * @author Moaz Mohamed
- */
 public class TabFragment extends BaseFragment implements LightningView.LightingViewListener {
 
     @SuppressWarnings("unused")
@@ -690,7 +686,7 @@ void hideKeyboard(CliqzMessages.HideKeyboard event) {
             // This if avoids calling searchBar.showTitleBar() multiple times and sending the same
             // telemetry signals multiple times
             if (set != null && imm.isActive(set)) {
-                searchBar.showTitleBar();
+                //searchBar.showTitleBar();
                 final String view = getTelemetryView();
                 telemetry.sendKeyboardSignal(false, mIsIncognito, getTelemetryView());
                 telemetry.sendQuickAccessBarSignal(TelemetryKeys.HIDE, null, view);
@@ -1255,7 +1251,7 @@ public void updateFavIcon(Messages.UpdateFavIcon event) {
     @Subscribe
     public void keyBoardClosed(Messages.KeyBoardClosed event) {
         searchBar.setTitle(searchBar.getQuery());
-        searchBar.showTitleBar();
+        searchBar.clearFocus(); // .showTitleBar();
     }
 
     @Subscribe
diff --git a/app/src/main/java/com/cliqz/browser/main/search/SearchView.java b/app/src/main/java/com/cliqz/browser/main/search/SearchView.java
index 708c05aa4..7ee4db042 100644
--- a/app/src/main/java/com/cliqz/browser/main/search/SearchView.java
+++ b/app/src/main/java/com/cliqz/browser/main/search/SearchView.java
@@ -78,7 +78,6 @@ public SearchView(AppCompatActivity context, Engine engine) {
         this.engine = engine;
         mReactView = engine.reactRootView;
         startTabContainer = new StartTabContainer(this.context);
-        startTabContainer.init(context.getSupportFragmentManager(), preferenceManager);
         incognito = BuildConfig.IS_NOT_LUMEN ? new Incognito(this.context) : null;
         // mReactView.setBackgroundColor(ContextCompat.getColor(this.context, R.color.normal_tab_primary_color));
         mReactView.setLayoutParams(
@@ -102,6 +101,7 @@ public void bringToFront() {
         if (query.equals("")) {
             setIncognito(state.isIncognito());
             mReactView.setVisibility(View.GONE);
+            startTabContainer.updateFreshTab();
         } else {
             mReactView.bringToFront();
             startTabContainer.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/cliqz/browser/starttab/HistoryItemTouchHelper.java b/app/src/main/java/com/cliqz/browser/starttab/HistoryItemTouchHelper.java
new file mode 100644
index 000000000..5cec5bf12
--- /dev/null
+++ b/app/src/main/java/com/cliqz/browser/starttab/HistoryItemTouchHelper.java
@@ -0,0 +1,62 @@
+package com.cliqz.browser.starttab;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.cliqz.browser.main.HistoryAdapter;
+
+import org.jetbrains.annotations.NotNull;
+
+import acr.browser.lightning.database.HistoryDatabase;
+
+public class HistoryItemTouchHelper extends ItemTouchHelper.SimpleCallback {
+
+    private final HistoryDatabase db;
+    private final HistoryAdapter adapter;
+
+    @SuppressWarnings("WeakerAccess")
+    public HistoryItemTouchHelper(HistoryDatabase db, HistoryAdapter adapter) {
+        super(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);
+        this.db = db;
+        this.adapter = adapter;
+    }
+
+    @Override
+    public int getSwipeDirs(@NonNull RecyclerView recyclerView,
+                            @NonNull RecyclerView.ViewHolder viewHolder) {
+        //Dont swipe date view and when contextual menu is enabled
+        if (viewHolder instanceof HistoryAdapter.DateViewHolder) {
+            return 0;
+        }
+        return super.getSwipeDirs(recyclerView, viewHolder);
+    }
+
+    @Override
+    public boolean onMove(@NonNull RecyclerView recyclerView,
+                          @NonNull RecyclerView.ViewHolder viewHolder,
+                          @NonNull RecyclerView.ViewHolder target) {
+        return false;
+    }
+
+    @Override
+    public void onSwiped(@NotNull RecyclerView.ViewHolder viewHolder, int direction) {
+        final int position = viewHolder.getAdapterPosition();
+        final int type = viewHolder.getItemViewType();
+        if (type == HistoryAdapter.VIEW_TYPE_HISTORY) {
+            db.deleteHistoryPoint(adapter.getHistoryId(position));
+            // historyDatabase.deleteHistoryPoint(historyList.get(position).getId());
+        } else {
+            db.deleteQuery(adapter.getQueryId(position));
+            // historyDatabase.deleteQuery(historyList.get(position).getId());
+        }
+        adapter.remove(position);
+        // adapter.notifyItemRemoved(position);
+        //check if date view is to be removed
+        if ((adapter.getItemViewType(position) == HistoryAdapter.VIEW_TYPE_DATE)
+                && adapter.getItemViewType(position - 1 ) == HistoryAdapter.VIEW_TYPE_DATE) {
+            adapter.remove(position-1);
+            // adapter.notifyItemRemoved(position-1);
+        }
+    }
+}
diff --git a/app/src/main/java/com/cliqz/browser/widget/SearchBar.java b/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
index 202284239..0d15ae69a 100644
--- a/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
+++ b/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
@@ -55,6 +55,8 @@ public class SearchBar extends FrameLayout {
     private float pivotX;
     private float pivotY;
     private AnimatedProgressBar progressBar;
+    private boolean mShowSearchEditTextAnimationRunning = false;
+    private boolean mShowTitleBarAnimationRunning = false;
 
     public interface Listener extends TextWatcher, OnFocusChangeListener {
         void onTitleClicked(SearchBar searchBar);
@@ -186,27 +188,59 @@ public void setAutocompleteText(String autocompleteText) {
     }
 
     public void showSearchEditText() {
-        progressBar.setVisibility(GONE);
-        //Don't redo the animation if the edittext is already visible
-        if (searchEditText.getVisibility() == VISIBLE) {
+        if (mShowSearchEditTextAnimationRunning || searchEditText.getVisibility() == VISIBLE) {
             return;
         }
-        // Postpone the animation in order to avoid the SearchEditText to intercept the same
-        // touch event that shown it
-        post(() -> {
-            searchEditText.setVisibility(VISIBLE);
-            final Animation animation = new ScaleAnimation(scaleX, 1.0f, scaleY, 1.0f, pivotX, pivotY);
-            animation.setDuration(150);
-            searchEditText.startAnimation(animation);
-            requestSearchFocus();
+        mShowSearchEditTextAnimationRunning = true;
+
+        progressBar.setVisibility(GONE);
+        final Animation animation = new ScaleAnimation(scaleX, 1.0f, scaleY, 1.0f, pivotX, pivotY);
+        animation.setDuration(150);
+        animation.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+                searchEditText.setVisibility(VISIBLE);
+                requestSearchFocus();
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                mShowSearchEditTextAnimationRunning = false;
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
         });
+        searchEditText.startAnimation(animation);
     }
 
     public void showTitleBar() {
+        if (mShowTitleBarAnimationRunning || searchEditText.getVisibility() != VISIBLE) {
+            return;
+        }
+        mShowTitleBarAnimationRunning = true;
         final Animation animation = new ScaleAnimation(1.0f, scaleX, 1.0f, scaleY, pivotX, pivotY);
         animation.setDuration(150);
+        animation.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+                searchEditText.clearFocus();
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                searchEditText.setVisibility(GONE);
+                mShowTitleBarAnimationRunning = false;
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+        });
         searchEditText.startAnimation(animation);
-        searchEditText.setVisibility(View.GONE);
     }
 
     public void showProgressBar() {
@@ -221,10 +255,6 @@ public void setProgress(int progress) {
         }
     }
 
-    public int getProgress() {
-        return progressBar.getProgress();
-    }
-
     public void setSearchText(String text) {
         searchEditText.setText(text);
     }
@@ -359,6 +389,12 @@ public void setStyle(boolean isIncognito) {
         }
     }
 
+    @Override
+    public void clearFocus() {
+        searchEditText.clearFocus();
+        super.clearFocus();
+    }
+
     private class ListenerWrapper implements TextWatcher, OnFocusChangeListener {
 
         @Override
@@ -390,9 +426,10 @@ public void onFocusChange(View v, boolean hasFocus) {
 
             if (hasFocus) {
                 post(SearchBar.this::showKeyBoard);
-            } else {
-                showTitleBar();
             }
+//            } else {
+//                showTitleBar();
+//            }
         }
     }
 }

From e118c60a0b384f042e82c7857b1db1c3f9d77fd2 Mon Sep 17 00:00:00 2001
From: Jayesh Solanki <jayeshsolanki93@gmail.com>
Date: Thu, 4 Jul 2019 17:41:28 +0200
Subject: [PATCH 16/57] AP-357 Implement design changes on dashboard (#140)

* AP-360 Implement design changes on subscription screen

* AP-357 Implement design changes on dashboard

* Remove ControlCenterDialog abstract class
---
 .../BaseControlCenterPagerAdapter.java        |  15 +-
 .../controlcenter/ControlCenterDialog.java    |  36 ++-
 .../controlcenter/ControlCenterFragment.java  |  19 --
 .../ControlCenterPagerAdapter.java            |   5 +-
 .../controlcenter/ControlCenterTabs.java      |  22 --
 .../controlcenter/ControlCenterViewPager.kt   |  18 --
 .../controlcenter/DashboardAdapter.java       | 174 --------------
 .../controlcenter/DashboardFragment.java      | 176 ---------------
 .../controlcenter/DashboardFragment.kt        | 183 +++++++++++++++
 .../controlcenter/DashboardItemEntity.java    |  54 -----
 .../browser/extensions/DrawableExtensions.kt  |  35 +++
 app/src/lumen/res/drawable/ic_adblock_on.xml  |  31 +++
 .../lumen/res/drawable/ic_antiphishing_on.xml |  25 ++
 .../lumen/res/drawable/ic_antitracking_on.xml |  25 ++
 .../res/drawable/ic_gb_data_saved_on.xml      |  43 ++++
 .../res/drawable/ic_kb_data_saved_on.xml      |  61 +++++
 .../res/drawable/ic_mb_data_saved_on.xml      |  43 ++++
 .../drawable/rounded_corner_solid_button.xml  |   6 +-
 .../res/layout/bond_dashboard_footer_view.xml |  16 --
 .../res/layout/bond_dashboard_fragment.xml    | 213 +++++++++++++++++-
 .../res/layout/control_center_layout.xml      |   8 -
 app/src/lumen/res/layout/dashboard_item1.xml  |  84 -------
 app/src/lumen/res/layout/dashboard_item2.xml  |  23 --
 .../res/layout/dashboard_item2_structure.xml  |  34 ---
 .../subscribe_ultimate_protection_view.xml    |  32 ++-
 app/src/lumen/res/values/colors.xml           |   2 +
 app/src/lumen/res/values/styles.xml           |   1 -
 27 files changed, 710 insertions(+), 674 deletions(-)
 delete mode 100644 app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterFragment.java
 delete mode 100644 app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterTabs.java
 delete mode 100644 app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardAdapter.java
 delete mode 100644 app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.java
 create mode 100644 app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt
 delete mode 100644 app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardItemEntity.java
 create mode 100644 app/src/lumen/res/drawable/ic_adblock_on.xml
 create mode 100644 app/src/lumen/res/drawable/ic_antiphishing_on.xml
 create mode 100644 app/src/lumen/res/drawable/ic_antitracking_on.xml
 create mode 100644 app/src/lumen/res/drawable/ic_gb_data_saved_on.xml
 create mode 100644 app/src/lumen/res/drawable/ic_kb_data_saved_on.xml
 create mode 100644 app/src/lumen/res/drawable/ic_mb_data_saved_on.xml
 delete mode 100644 app/src/lumen/res/layout/bond_dashboard_footer_view.xml
 delete mode 100644 app/src/lumen/res/layout/dashboard_item1.xml
 delete mode 100644 app/src/lumen/res/layout/dashboard_item2.xml
 delete mode 100644 app/src/lumen/res/layout/dashboard_item2_structure.xml

diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/BaseControlCenterPagerAdapter.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/BaseControlCenterPagerAdapter.java
index 84e35268e..579d6bf87 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/BaseControlCenterPagerAdapter.java
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/BaseControlCenterPagerAdapter.java
@@ -1,7 +1,5 @@
 package com.cliqz.browser.controlcenter;
 
-import android.content.Context;
-
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
@@ -16,14 +14,13 @@
  */
 public abstract class BaseControlCenterPagerAdapter extends FragmentPagerAdapter {
 
-    private Context mContext;
-    final List<ControlCenterFragment> mFragmentList = new ArrayList<>();
+    final List<DashboardFragment> mFragmentList = new ArrayList<>();
 
-    BaseControlCenterPagerAdapter(FragmentManager fm, Context context) {
+    BaseControlCenterPagerAdapter(FragmentManager fm) {
         super(fm);
-        mContext = context;
     }
 
+    @Override
     public Fragment getItem(int position) {
         return mFragmentList.get(position);
     }
@@ -33,11 +30,7 @@ public int getCount() {
     }
 
     public CharSequence getPageTitle(int position) {
-        return mFragmentList.get(position).getTitle(mContext, position);
-    }
-
-    void updateCurrentView(int position) {
-        mFragmentList.get(position).refreshUI();
+        return mFragmentList.get(position).getTitle();
     }
 
     void updateViewComponent(int position, boolean optionValue) {
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
index 11e2761f4..9dc9630f8 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
@@ -1,6 +1,7 @@
 package com.cliqz.browser.controlcenter;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.util.Log;
@@ -14,6 +15,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SwitchCompat;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 
@@ -67,9 +69,6 @@ public class ControlCenterDialog extends DialogFragment {
     @BindView(R.id.subscribe_ultimate_protection_btn)
     Button subscribeUltimateProtectionBtn;
 
-    @BindView(R.id.dashboard_disable_overlay)
-    View dashboardDisableOverlay;
-
     @Inject
     AntiTracking antiTracking;
 
@@ -136,11 +135,12 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        final View view = LayoutInflater.from(getContext()).inflate(R.layout.control_center_layout,
+        final Context context = getContext();
+        final View view = LayoutInflater.from(context).inflate(R.layout.control_center_layout,
                 container, false);
         ButterKnife.bind(this, view);
 
-        mControlCenterPagerAdapter = new ControlCenterPagerAdapter(getChildFragmentManager(), getContext());
+        mControlCenterPagerAdapter = new ControlCenterPagerAdapter(getChildFragmentManager());
         mControlCenterPagerAdapter.init();
         controlCenterPager.setAdapter(mControlCenterPagerAdapter);
         controlCenterTabLayout.setupWithViewPager(controlCenterPager);
@@ -150,9 +150,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         ultimateProtectionSwitch.setOnCheckedChangeListener((compoundButton, isChecked) -> {
             mControlCenterPagerAdapter.updateViewComponent(0, isChecked);
             mControlCenterPagerAdapter.updateViewComponent(1, isChecked);
+            toggleTabLayout(isChecked);
             try {
                 adblocker.setEnabled(isChecked);
-                antiTracking.setEnabled(isChecked);;
+                antiTracking.setEnabled(isChecked);
                 preferenceManager.setAttrackEnabled(isChecked);
                 preferenceManager.setAdBlockEnabled(isChecked);
                 bus.post(new Messages.onDashboardStateChange());
@@ -174,7 +175,7 @@ void clearDashboardData(Messages.ClearDashboardData clearDashboardData) {
 
     @Subscribe
     void onPurchaseCompleted(Messages.PurchaseCompleted purchaseCompleted) {
-        hideSubscribeButton(purchasesManager.getPurchase().isDashboardEnabled());
+        hideSubscribeButton(purchasesManager.isDashboardEnabled());
     }
 
     @Override
@@ -188,10 +189,11 @@ public void onConfigurationChanged(Configuration newConfig) {
     }
 
     private void hideSubscribeButton(boolean isDashboardEnabled) {
+        toggleTabLayout(isDashboardEnabled);
         ultimateProtectionSwitch.setChecked(preferenceManager.isAttrackEnabled() &&
                 preferenceManager.getAdBlockEnabled());
         subscribeUltimateProtectionView.setVisibility(isDashboardEnabled ? View.GONE : View.VISIBLE);
-        dashboardDisableOverlay.setVisibility(isDashboardEnabled ? View.GONE : View.VISIBLE);
+        ultimateProtectionContainer.setVisibility(isDashboardEnabled ? View.VISIBLE : View.GONE);
         ViewExtensionsKt.enableViewHierarchy(ultimateProtectionContainer, isDashboardEnabled);
         ViewExtensionsKt.enableViewHierarchy(controlCenterTabLayout, isDashboardEnabled);
         controlCenterPager.isPagingEnabled = isDashboardEnabled;
@@ -202,9 +204,25 @@ private void hideSubscribeButton(boolean isDashboardEnabled) {
         }
     }
 
+    private void toggleTabLayout(boolean isEnabled) {
+        final Context context = getContext();
+        if (isEnabled) {
+            controlCenterTabLayout.setSelectedTabIndicatorColor(
+                    ContextCompat.getColor(context,R.color.bond_general_color_blue));
+            controlCenterTabLayout.setTabTextColors(
+                    ContextCompat.getColor(context, R.color.bond_disabled_text_color),
+                    ContextCompat.getColor(context, R.color.bond_general_color_blue));
+        } else {
+            controlCenterTabLayout.setSelectedTabIndicatorColor(
+                    ContextCompat.getColor(context,R.color.lumen_color_grey_text));
+            controlCenterTabLayout.setTabTextColors(
+                    ContextCompat.getColor(context, R.color.lumen_color_grey_text),
+                    ContextCompat.getColor(context, R.color.lumen_color_grey_text));
+        }
+    }
 
     private void updateUI() {
-        for (ControlCenterFragment fragment : mControlCenterPagerAdapter.mFragmentList) {
+        for (DashboardFragment fragment : mControlCenterPagerAdapter.mFragmentList) {
             fragment.updateUI();
         }
     }
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterFragment.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterFragment.java
deleted file mode 100644
index 8fda22f22..000000000
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterFragment.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.cliqz.browser.controlcenter;
-
-import android.content.Context;
-
-import androidx.fragment.app.Fragment;
-
-/**
- * Copyright © Cliqz 2019
- */
-public abstract class ControlCenterFragment extends Fragment {
-
-    public abstract String getTitle(Context context, int position);
-
-    public abstract void updateUI();
-
-    public abstract void refreshUI();
-
-    public abstract void refreshUIComponent(boolean optionValue);
-}
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterPagerAdapter.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterPagerAdapter.java
index 7eed075e7..148ee09b2 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterPagerAdapter.java
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterPagerAdapter.java
@@ -1,6 +1,5 @@
 package com.cliqz.browser.controlcenter;
 
-import android.content.Context;
 import android.os.Bundle;
 
 import androidx.fragment.app.FragmentManager;
@@ -12,8 +11,8 @@ public class ControlCenterPagerAdapter extends BaseControlCenterPagerAdapter {
 
     static final String IS_TODAY = "is_daily";
 
-    ControlCenterPagerAdapter(FragmentManager fm, Context context) {
-        super(fm, context);
+    ControlCenterPagerAdapter(FragmentManager fm) {
+        super(fm);
     }
 
     public void init() {
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterTabs.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterTabs.java
deleted file mode 100644
index 8368ed6fc..000000000
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterTabs.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.cliqz.browser.controlcenter;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.StringRes;
-
-/**
- * @author Stefano Pacifici
- */
-enum ControlCenterTabs {
-
-    ;
-
-    @StringRes
-    final int title;
-
-    final Class<? extends ControlCenterFragment> fragmentClass;
-
-    ControlCenterTabs(@StringRes int title, @NonNull Class<? extends ControlCenterFragment> clazz) {
-        this.title = title;
-        this.fragmentClass = clazz;
-    }
-}
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterViewPager.kt b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterViewPager.kt
index f632d6084..db171b708 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterViewPager.kt
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterViewPager.kt
@@ -16,24 +16,6 @@ class ControlCenterViewPager @JvmOverloads constructor(
     @JvmField
     internal var isPagingEnabled = true
 
-    init {
-        addOnPageChangeListener(object : OnPageChangeListener {
-            override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
-                // Do nothing
-            }
-
-            override fun onPageSelected(position: Int) {
-                if (adapter != null) {
-                    (adapter as ControlCenterPagerAdapter).updateCurrentView(position)
-                }
-            }
-
-            override fun onPageScrollStateChanged(state: Int) {
-                // Do nothing
-            }
-        })
-    }
-
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent): Boolean {
         return this.isPagingEnabled && super.onTouchEvent(event)
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardAdapter.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardAdapter.java
deleted file mode 100644
index c8f10520d..000000000
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardAdapter.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package com.cliqz.browser.controlcenter;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.style.TypefaceSpan;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.cliqz.browser.R;
-import com.cliqz.browser.main.Messages;
-import com.cliqz.nove.Bus;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Copyright © Cliqz 2019
- */
-public class DashboardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    private static final int FOOTER_VIEW = 1;
-    private static final int REGULAR_VIEW = 2;
-
-    private final Context mContext;
-    private final List<DashboardItemEntity> mDashboardItems;
-    private final Bus mBus;
-
-    private boolean mIsDashboardEnabled = true;
-
-    DashboardAdapter(Context context, Bus bus) {
-        mContext = context;
-        mDashboardItems = new ArrayList<>();
-        mBus = bus;
-    }
-
-    @NonNull
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        if (viewType == REGULAR_VIEW) {
-            final View view = LayoutInflater.from(mContext).inflate(R.layout.dashboard_item2,
-                    parent, false);
-            return new TwoItemsViewHolder(view);
-        } else {
-            final View view = LayoutInflater.from(mContext).inflate(R.layout.bond_dashboard_footer_view,
-                    parent, false);
-            return new FooterViewHolder(view);
-        }
-    }
-
-    private void setTwoItemsRowValues(ItemStructure view, DashboardItemEntity item) {
-        String measurementText = item.getMeasurementValue();
-        final int unitStartIdx = measurementText.length();
-        if (!item.getMeasurementUnit().isEmpty()) {
-            measurementText = measurementText.concat("\n").concat(item.getMeasurementUnit());
-        }
-        final Spannable spannable = new SpannableString(measurementText);
-        spannable.setSpan(new TypefaceSpan(mContext.getString(R.string.roboto_light)), unitStartIdx, measurementText.length()
-                , Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        view.itemMeasurementView.setText(spannable);
-        if (item.getmViewType() == DashboardItemEntity.VIEW_TYPE_SHIELD) {
-            view.itemMeasurementView.setBackgroundResource(item.getIconResId());
-        } else {
-            view.itemMeasurementView.setCompoundDrawablesWithIntrinsicBounds(0, item.getIconResId(), 0, 0);
-        }
-        view.itemTitleView.setText(item.getTitle());
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        if (holder instanceof TwoItemsViewHolder) {
-            final TwoItemsViewHolder viewHolder = (TwoItemsViewHolder) holder;
-            setTwoItemsRowValues(viewHolder.leftItem, mDashboardItems.get(position * 2));
-            setTwoItemsRowValues(viewHolder.rightItem, mDashboardItems.get(position * 2 + 1));
-            viewHolder.leftItem.changeState(mIsDashboardEnabled);
-            viewHolder.rightItem.changeState(mIsDashboardEnabled);
-        } else {
-            final FooterViewHolder viewHolder = (FooterViewHolder) holder;
-            if (mIsDashboardEnabled) {
-                viewHolder.resetButton.setOnClickListener(v -> new AlertDialog.Builder(v.getContext())
-                        .setTitle(R.string.bond_dashboard_clear_dialog_title)
-                        .setMessage(R.string.bond_dashboard_clear_dialog_message)
-                        .setPositiveButton(R.string.button_ok, (dialogInterface, i) -> {
-                            mBus.post(new Messages.ClearDashboardData());
-                        })
-                        .setNegativeButton(R.string.cancel, null)
-                        .show());
-            }
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        //The data is shown in groups of 2 and we have a footer item in the end.
-        return mDashboardItems.size() / 2 + 1;
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        if (position == mDashboardItems.size() / 2) {
-            return FOOTER_VIEW;
-        } else {
-            return REGULAR_VIEW;
-        }
-    }
-
-    void addItems(List<DashboardItemEntity> items) {
-        mDashboardItems.clear();
-        mDashboardItems.addAll(items);
-        notifyDataSetChanged();
-    }
-
-    void setIsDashboardEnabled(boolean isDashboardEnabled) {
-        mIsDashboardEnabled = isDashboardEnabled;
-        notifyDataSetChanged();
-    }
-
-    private enum ItemType {
-        ONE_VIEW, TWO_VIEWS
-    }
-
-    private class ItemStructure {
-        RelativeLayout itemLayout;
-        TextView itemMeasurementView;
-        TextView itemTitleView;
-
-        void changeState(boolean isEnabled) {
-            itemMeasurementView.setEnabled(isEnabled);
-            itemTitleView.setEnabled(isEnabled);
-        }
-    }
-
-    private class TwoItemsViewHolder extends RecyclerView.ViewHolder {
-        final ItemStructure leftItem;
-        final ItemStructure rightItem;
-
-        TwoItemsViewHolder(View itemView) {
-            super(itemView);
-            final RelativeLayout leftView = itemView.findViewById(R.id.left_item);
-            leftItem = findViews(leftView);
-            leftItem.itemLayout = leftView;
-
-            leftItem.changeState(mIsDashboardEnabled);
-            final RelativeLayout rightView = itemView.findViewById(R.id.right_item);
-            rightItem = findViews(rightView);
-            rightItem.itemLayout = rightView;
-            rightItem.changeState(mIsDashboardEnabled);
-        }
-
-        private ItemStructure findViews(View view) {
-            final ItemStructure item = new ItemStructure();
-            item.itemTitleView = view.findViewById(R.id.item_title);
-            item.itemMeasurementView = view.findViewById(R.id.item_measurement);
-            return item;
-        }
-    }
-
-    private class FooterViewHolder extends RecyclerView.ViewHolder {
-        final TextView resetButton;
-
-        FooterViewHolder(View view) {
-            super(view);
-            resetButton = view.findViewById(R.id.reset);
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.java
deleted file mode 100644
index 561ed4bd4..000000000
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.cliqz.browser.controlcenter;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.cliqz.browser.R;
-import com.cliqz.browser.app.BrowserApp;
-import com.cliqz.browser.main.FlavoredActivityComponent;
-import com.cliqz.browser.main.Messages;
-import com.cliqz.browser.purchases.PurchasesManager;
-import com.cliqz.jsengine.Insights;
-import com.cliqz.jsengine.ReadableMapUtils;
-import com.cliqz.nove.Bus;
-import com.cliqz.nove.Subscribe;
-import com.facebook.react.bridge.ReadableMap;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import acr.browser.lightning.preference.PreferenceManager;
-
-import static com.cliqz.browser.controlcenter.DashboardItemEntity.VIEW_TYPE_ICON;
-import static com.cliqz.browser.controlcenter.DashboardItemEntity.VIEW_TYPE_SHIELD;
-
-/**
- * Copyright © Cliqz 2019
- */
-public class DashboardFragment extends ControlCenterFragment {
-
-    private DashboardAdapter mDashboardAdapter;
-    private boolean mIsDailyView;
-    private final int[] tabsTitleIds = {
-            R.string.bond_dashboard_today_title, R.string.bond_dashboard_week_title};
-
-    @Inject
-    Bus bus;
-
-    @Inject
-    Insights insights;
-
-    @Inject
-    PurchasesManager purchasesManager;
-
-    @Inject
-    PreferenceManager preferenceManager;
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        final Bundle arguments = getArguments();
-        if (arguments != null) {
-            mIsDailyView = arguments.getBoolean(ControlCenterPagerAdapter.IS_TODAY);
-        }
-        final FlavoredActivityComponent component = getActivity() != null ?
-                BrowserApp.getActivityComponent(getActivity()) : null;
-        if (component != null) {
-            component.inject(this);
-        }
-        bus.register(this);
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        final View view = inflater.inflate(R.layout.bond_dashboard_fragment, container,
-                false);
-        final RecyclerView dashBoardListView = view.findViewById(R.id.dashboard_list_view);
-        mDashboardAdapter = new DashboardAdapter(getContext(), bus);
-        updateUI();
-        dashBoardListView.setAdapter(mDashboardAdapter);
-        dashBoardListView.setLayoutManager(new LinearLayoutManager(getContext()));
-        changeDashboardState(purchasesManager.isDashboardEnabled() &&
-                preferenceManager.isAttrackEnabled() && preferenceManager.getAdBlockEnabled());
-        return view;
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        updateUI();
-    }
-
-    public void changeDashboardState(boolean isEnabled) {
-        mDashboardAdapter.setIsDashboardEnabled(isEnabled);
-    }
-
-    @Override
-    public String getTitle(Context context, int pos) {
-        return context.getString(tabsTitleIds[pos]);
-    }
-
-    @Override
-    public void updateUI() {
-        if (mDashboardAdapter == null || getView() == null) {
-            return;
-        }
-        if (mIsDailyView) {
-            insights.getInsightsData((data) -> getView().post(() -> updateViews(data.getMap("result"))), "day");
-        } else {
-            insights.getInsightsData((data) -> getView().post(() -> updateViews(data.getMap("result"))), "week");
-        }
-
-    }
-
-    @Override
-    public void refreshUI() {
-        if (getView() == null) {
-            return; //return if view is not inflated yet
-        }
-        mDashboardAdapter.notifyDataSetChanged();
-    }
-
-    @Override
-    public void refreshUIComponent(boolean optionValue) {
-        changeDashboardState(optionValue);
-    }
-
-    public void updateViews(ReadableMap data) {
-        if (data == null) {
-            return;
-        }
-
-        final MeasurementWrapper dataSaved;
-        final MeasurementWrapper adsBlocked;
-        final MeasurementWrapper trackersDetected;
-        final MeasurementWrapper pagesVisited;
-
-        if (purchasesManager.isDashboardEnabled() &&
-                preferenceManager.getAdBlockEnabled() && preferenceManager.isAttrackEnabled()) {
-            dataSaved = ValuesFormatterUtil.formatBytesCount(ReadableMapUtils.getSafeInt(data, "dataSaved"));
-            adsBlocked = ValuesFormatterUtil.formatBlockCount(ReadableMapUtils.getSafeInt(data,"adsBlocked"));
-            trackersDetected = ValuesFormatterUtil.formatBlockCount(ReadableMapUtils.getSafeInt(data, "trackersDetected"));
-            pagesVisited = ValuesFormatterUtil.formatBlockCount(ReadableMapUtils.getSafeInt(data,"pages"));
-        } else {
-            dataSaved = ValuesFormatterUtil.formatBytesCount(0);
-            adsBlocked = ValuesFormatterUtil.formatBlockCount(0);
-            trackersDetected = ValuesFormatterUtil.formatBlockCount(0);
-            pagesVisited = ValuesFormatterUtil.formatBlockCount(0);
-        }
-
-        final List<DashboardItemEntity> dashboardItems = new ArrayList<>();
-
-        dashboardItems.add(new DashboardItemEntity(adsBlocked.getValue(),
-                adsBlocked.getUnit() == 0 ? "" : getString(adsBlocked.getUnit()),
-                R.drawable.ic_ad_blocking_shiel, getString(R.string.bond_dashboard_ads_blocked_title), -1, VIEW_TYPE_SHIELD));
-        dashboardItems.add(new DashboardItemEntity(trackersDetected.getValue(), "",
-                R.drawable.ic_eye, getString(R.string.bond_dashboard_tracking_companies_title), -1, VIEW_TYPE_ICON));
-        dashboardItems.add(new DashboardItemEntity(dataSaved.getValue(),
-                dataSaved.getUnit() == 0 ? "" : getString(dataSaved.getUnit()), R.drawable.ic_ad_blocking_shiel,
-                getString(R.string.bond_dashboard_data_saved_title), -1, VIEW_TYPE_SHIELD));
-        dashboardItems.add(new DashboardItemEntity(pagesVisited.getValue(), "", R.drawable.ic_anti_phishing_hook,
-                getString(R.string.bond_dashboard_phishing_protection_title), -1, VIEW_TYPE_ICON));
-        mDashboardAdapter.addItems(dashboardItems);
-    }
-
-    @Subscribe
-    void onPurchaseCompleted(Messages.PurchaseCompleted purchaseCompleted) {
-        if (purchasesManager.getPurchase().isDashboardEnabled()) {
-            bus.post(new Messages.EnableAdBlock());
-            bus.post(new Messages.EnableAttrack());
-            changeDashboardState(true);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt b/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt
new file mode 100644
index 000000000..6ece9b241
--- /dev/null
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt
@@ -0,0 +1,183 @@
+package com.cliqz.browser.controlcenter
+
+import acr.browser.lightning.preference.PreferenceManager
+import android.graphics.Color
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.cliqz.browser.R
+import com.cliqz.browser.app.BrowserApp
+import com.cliqz.browser.extensions.color
+import com.cliqz.browser.extensions.setDrawable
+import com.cliqz.browser.extensions.tintVectorDrawable
+import com.cliqz.browser.main.Messages
+import com.cliqz.browser.purchases.PurchasesManager
+import com.cliqz.jsengine.Insights
+import com.cliqz.jsengine.ReadableMapUtils
+import com.cliqz.nove.Bus
+import com.cliqz.nove.Subscribe
+import com.facebook.react.bridge.ReadableMap
+import kotlinx.android.synthetic.lumen.bond_dashboard_fragment.*
+import javax.inject.Inject
+
+class DashboardFragment : Fragment() {
+
+    private var isDailyView = false
+
+    @Inject
+    internal lateinit var bus: Bus
+
+    @Inject
+    internal lateinit var insights: Insights
+
+    @Inject
+    internal lateinit var purchasesManager: PurchasesManager
+
+    @Inject
+    internal lateinit var preferenceManager: PreferenceManager
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        isDailyView = arguments?.getBoolean(ControlCenterPagerAdapter.IS_TODAY) ?: true
+        BrowserApp.getActivityComponent(activity)?.inject(this)
+        bus.register(this)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.bond_dashboard_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        changeDashboardState(purchasesManager.isDashboardEnabled() &&
+                preferenceManager.isAttrackEnabled && preferenceManager.adBlockEnabled)
+        reset.setOnClickListener {
+            if (!preferenceManager.isAttrackEnabled && !preferenceManager.adBlockEnabled) {
+                return@setOnClickListener
+            }
+            android.app.AlertDialog.Builder(it.context)
+                    .setTitle(R.string.bond_dashboard_clear_dialog_title)
+                    .setMessage(R.string.bond_dashboard_clear_dialog_message)
+                    .setPositiveButton(R.string.button_ok) { _, _ ->
+                        bus.post(Messages.ClearDashboardData())
+                    }
+                    .setNegativeButton(R.string.cancel, null)
+                    .show()
+        }
+        updateUI()
+    }
+
+    fun getTitle(): String {
+        return if (isDailyView) {
+            context!!.getString(R.string.bond_dashboard_today_title)
+        } else {
+            context!!.getString(R.string.bond_dashboard_week_title)
+        }
+    }
+
+    fun updateUI() {
+        val periodType = if (isDailyView) "day" else "week"
+        insights.getInsightsData({
+            view?.post {
+                updateViews(it.getMap("result"))
+            }
+        }, periodType)
+    }
+
+    fun refreshUIComponent(optionValue: Boolean) {
+        changeDashboardState(optionValue)
+    }
+
+    private fun updateViews(data: ReadableMap?) {
+        if (data == null) return
+
+        val dataSaved: MeasurementWrapper
+        val adsBlocked: MeasurementWrapper
+        val trackersDetected: MeasurementWrapper
+        val pagesVisited: MeasurementWrapper
+
+        if (purchasesManager.isDashboardEnabled() &&
+                preferenceManager.adBlockEnabled && preferenceManager.isAttrackEnabled) {
+            dataSaved = ValuesFormatterUtil.formatBytesCount(ReadableMapUtils.getSafeInt(data, "dataSaved"))
+            adsBlocked = ValuesFormatterUtil.formatBlockCount(ReadableMapUtils.getSafeInt(data, "adsBlocked"))
+            trackersDetected = ValuesFormatterUtil.formatBlockCount(ReadableMapUtils.getSafeInt(data, "trackersDetected"))
+            pagesVisited = ValuesFormatterUtil.formatBlockCount(ReadableMapUtils.getSafeInt(data, "pages"))
+        } else {
+            dataSaved = ValuesFormatterUtil.formatBytesCount(0)
+            adsBlocked = ValuesFormatterUtil.formatBlockCount(0)
+            trackersDetected = ValuesFormatterUtil.formatBlockCount(0)
+            pagesVisited = ValuesFormatterUtil.formatBlockCount(0)
+        }
+
+        ads_blocked.text = adsBlocked.value
+        trackers_detected.text = trackersDetected.value
+        data_saved.text = dataSaved.value
+        phishing_checked.text = pagesVisited.value
+
+        data_saved_icon.setDrawable(when (dataSaved.unit) {
+            R.string.bond_dashboard_units_kb -> R.drawable.ic_kb_data_saved_on
+            R.string.bond_dashboard_units_mb -> R.drawable.ic_mb_data_saved_on
+            R.string.bond_dashboard_units_gb -> R.drawable.ic_gb_data_saved_on
+            else -> throw IllegalArgumentException("Wrong unit for 'data saved' data")
+        })
+    }
+
+    private fun changeDashboardState(isEnabled: Boolean) {
+        if (isEnabled) {
+            ads_blocked_icon.clearColorFilter()
+            trackers_detected_icon.clearColorFilter()
+            data_saved_icon.clearColorFilter()
+            phishing_checked_icon.clearColorFilter()
+            context?.apply {
+                ads_blocked.setTextColor(Color.WHITE)
+                trackers_detected.setTextColor(Color.WHITE)
+                data_saved.setTextColor(Color.WHITE)
+                phishing_checked.setTextColor(Color.WHITE)
+
+                ads_blocked_text.setTextColor(Color.WHITE)
+                trackers_detected_text.setTextColor(Color.WHITE)
+                data_saved_text.setTextColor(Color.WHITE)
+                phishing_checked_text.setTextColor(Color.WHITE)
+
+                reset.setTextColor(color(R.color.lumen_color_blue_primary))
+
+                vertical_line.setBackgroundColor(color(R.color.lumen_color_blue_primary_opaque))
+                horizontal_line.setBackgroundColor(color(R.color.lumen_color_blue_primary_opaque))
+            }
+        } else {
+            ads_blocked_icon.tintVectorDrawable(R.color.lumen_color_grey_text)
+            trackers_detected_icon.tintVectorDrawable(R.color.lumen_color_grey_text)
+            data_saved_icon.tintVectorDrawable(R.color.lumen_color_grey_text)
+            phishing_checked_icon.tintVectorDrawable(R.color.lumen_color_grey_text)
+            context?.apply {
+                ads_blocked.setTextColor(color(R.color.lumen_color_grey_text))
+                trackers_detected.setTextColor(color(R.color.lumen_color_grey_text))
+                data_saved.setTextColor(color(R.color.lumen_color_grey_text))
+                phishing_checked.setTextColor(color(R.color.lumen_color_grey_text))
+
+                ads_blocked_text.setTextColor(color(R.color.lumen_color_grey_text))
+                trackers_detected_text.setTextColor(color(R.color.lumen_color_grey_text))
+                data_saved_text.setTextColor(color(R.color.lumen_color_grey_text))
+                phishing_checked_text.setTextColor(color(R.color.lumen_color_grey_text))
+
+                reset.setTextColor(color(R.color.lumen_color_grey_text))
+
+                vertical_line.setBackgroundColor(color(R.color.lumen_color_grey_text))
+                horizontal_line.setBackgroundColor(color(R.color.lumen_color_grey_text))
+            }
+        }
+    }
+
+    @Subscribe
+    internal fun onPurchaseCompleted(purchaseCompleted: Messages.PurchaseCompleted) {
+        if (purchasesManager.purchase.isDashboardEnabled) {
+            bus.post(Messages.EnableAdBlock())
+            bus.post(Messages.EnableAttrack())
+            changeDashboardState(true)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardItemEntity.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardItemEntity.java
deleted file mode 100644
index 2a938cbf1..000000000
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardItemEntity.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.cliqz.browser.controlcenter;
-
-/**
- * Copyright © Cliqz 2019
- */
-public class DashboardItemEntity {
-
-    static final int VIEW_TYPE_SHIELD = 1;
-    static final int VIEW_TYPE_ICON = 2;
-
-    private String mMeasurementValue;
-    private String mMeasurementUnit;
-    private int mIconResId;
-    private String mTitle;
-    private int mOptionValue;
-    private int mViewType;
-
-    DashboardItemEntity(String measurementValue, String measurementUnit, int iconResId, String title, int optionValue, int viewType) {
-        this.mMeasurementValue = measurementValue;
-        this.mMeasurementUnit = measurementUnit;
-        this.mIconResId = iconResId;
-        this.mTitle = title;
-        this.mOptionValue = optionValue;
-        this.mViewType = viewType;
-    }
-
-    String getMeasurementValue() {
-        return mMeasurementValue;
-    }
-
-    String getMeasurementUnit() {
-        return mMeasurementUnit;
-    }
-
-    int getIconResId() {
-        return mIconResId;
-    }
-
-    public void setIconResId(int iconResId) {
-        this.mIconResId = iconResId;
-    }
-
-    public String getTitle() {
-        return mTitle;
-    }
-
-    public void setTitle(String title) {
-        this.mTitle = title;
-    }
-
-    public int getmViewType() {
-        return mViewType;
-    }
-}
diff --git a/app/src/lumen/java/com/cliqz/browser/extensions/DrawableExtensions.kt b/app/src/lumen/java/com/cliqz/browser/extensions/DrawableExtensions.kt
index a377f1d3e..6d64402ee 100644
--- a/app/src/lumen/java/com/cliqz/browser/extensions/DrawableExtensions.kt
+++ b/app/src/lumen/java/com/cliqz/browser/extensions/DrawableExtensions.kt
@@ -1,10 +1,45 @@
 package com.cliqz.browser.extensions
 
+import android.content.Context
+import android.graphics.PorterDuff
+import android.graphics.drawable.Drawable
+import android.widget.ImageView
 import android.widget.TextView
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
 
 fun TextView.drawableStart(@DrawableRes id: Int) {
     val drawable = ContextCompat.getDrawable(context, id)
     setCompoundDrawablesWithIntrinsicBounds(drawable, null, null,  null)
 }
+
+fun ImageView.setDrawable(@DrawableRes id: Int) {
+    setImageDrawable(ContextCompat.getDrawable(context, id))
+}
+
+@ColorInt fun Context.getColorCompat(@ColorRes id: Int): Int {
+    return ContextCompat.getColor(this, id)
+}
+
+fun ImageView.tint(@ColorRes id: Int) {
+    drawable.tint(context, id)
+}
+
+fun Drawable.tint(@ColorInt value: Int): Drawable {
+    val tintedDrawable = DrawableCompat.wrap(this).mutate()
+    DrawableCompat.setTint(tintedDrawable, value)
+    return tintedDrawable
+}
+
+fun Drawable.tint(context: Context, @ColorRes id: Int): Drawable {
+    return tint(context.getColorCompat(id))
+}
+
+fun ImageView.tintVectorDrawable(@ColorRes id: Int) {
+    setColorFilter(ContextCompat.getColor(context, id), PorterDuff.Mode.SRC_IN)
+}
+
+fun Context.color(@ColorRes id: Int) = ContextCompat.getColor(this, id)
diff --git a/app/src/lumen/res/drawable/ic_adblock_on.xml b/app/src/lumen/res/drawable/ic_adblock_on.xml
new file mode 100644
index 000000000..bb7459422
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_adblock_on.xml
@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="57.5dp"
+    android:height="50dp"
+    android:viewportWidth="46"
+    android:viewportHeight="40">
+    <path
+        android:fillType="nonZero"
+        android:pathData="M9.97,9.8378L37.3864,27.4627L41.6666,20.049L32.2686,3.7712L13.4726,3.7712L9.97,9.8378ZM35.6344,30.4972L8.218,12.8724L4.0745,20.049L13.4726,36.3269L32.2686,36.3269L35.6344,30.4972ZM34.2893,0.2712L45.7081,20.049L34.2893,39.8269L11.4518,39.8269L0.0331,20.049L11.4518,0.2712L34.2893,0.2712Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="22.8706"
+                android:endY="39.8269"
+                android:startX="22.8706"
+                android:startY="0.2712"
+                android:type="linear">
+                <item
+                    android:color="#FFDFAAB7"
+                    android:offset="0" />
+                <item
+                    android:color="#FFA4ACFE"
+                    android:offset="0.3693551" />
+                <item
+                    android:color="#FF1C9EFF"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
diff --git a/app/src/lumen/res/drawable/ic_antiphishing_on.xml b/app/src/lumen/res/drawable/ic_antiphishing_on.xml
new file mode 100644
index 000000000..2f76b1ff0
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_antiphishing_on.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="32.19dp"
+    android:height="52dp"
+    android:viewportWidth="26"
+    android:viewportHeight="42">
+  <path
+      android:pathData="M21.5286,11.6509L21.5286,32.734C21.5286,43.39 5.6707,44.6494 3.4938,34.2707L2.8546,31.6454L2.7912,31.7335L-0.05,29.6895L4.4556,23.4266L5.3554,27.122L6.9068,33.4973C8.247,39.8842 18.0286,39.1074 18.0286,32.734L18.0286,11.6509L14.4091,11.6509L14.4091,0.7641L25.296,0.7641L25.296,11.6509L21.5286,11.6509ZM17.9091,4.2641L17.9091,8.1509L21.796,8.1509L21.796,4.2641L17.9091,4.2641Z"
+      android:strokeWidth="1"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="0.7641"
+          android:startX="12.623"
+          android:endY="44.6494"
+          android:endX="12.623"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDFAAB7"/>
+        <item android:offset="0.3693551" android:color="#FFA4ACFE"/>
+        <item android:offset="1" android:color="#FF1C9EFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/app/src/lumen/res/drawable/ic_antitracking_on.xml b/app/src/lumen/res/drawable/ic_antitracking_on.xml
new file mode 100644
index 000000000..1d76baf8d
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_antitracking_on.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="52.77dp"
+    android:height="54dp"
+    android:viewportWidth="43"
+    android:viewportHeight="44">
+  <path
+      android:pathData="M14.8105,21.0615L14.8105,17.5615L28.8105,17.5615L28.8105,21.0615L14.8105,21.0615ZM42.2951,9.0265L39.8203,11.5013C30.0434,1.7245 14.192,1.7245 4.4152,11.5013L1.9403,9.0265C13.084,-2.1172 31.1515,-2.1172 42.2951,9.0265ZM7.1779,32.1684L3.301,37.9162L0.3993,35.959L4.3154,30.1532C3.4943,29.4963 2.7012,28.7873 1.9403,28.0265L4.4152,25.5516C14.192,35.3284 30.0434,35.3284 39.8203,25.5516L42.2951,28.0265C41.1906,29.131 40.0181,30.126 38.7911,31.0115L42.1282,35.959L39.2265,37.9162L35.8307,32.8817C34.3441,33.6969 32.8003,34.3699 31.2192,34.9005L33.2418,41.1254L29.9131,42.207L27.8342,35.8089C26.2473,36.1319 24.6381,36.3188 23.0255,36.3699L23.0255,43.4637L19.5255,43.4637L19.5255,36.2669C17.9392,36.1231 16.3626,35.8469 14.8137,35.4384L12.6144,42.207L9.2857,41.1254L11.4906,34.3394C10.0075,33.7452 8.5641,33.0215 7.1779,32.1684Z"
+      android:strokeWidth="1"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startY="-2.1172"
+          android:startX="21.3472"
+          android:endY="43.4637"
+          android:endX="21.3472"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDFAAB7"/>
+        <item android:offset="0.3693551" android:color="#FFA4ACFE"/>
+        <item android:offset="1" android:color="#FF1C9EFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/app/src/lumen/res/drawable/ic_gb_data_saved_on.xml b/app/src/lumen/res/drawable/ic_gb_data_saved_on.xml
new file mode 100644
index 000000000..a6d09255b
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_gb_data_saved_on.xml
@@ -0,0 +1,43 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="44dp"
+    android:height="39dp"
+    android:viewportWidth="44"
+    android:viewportHeight="39">
+  <path
+      android:pathData="M0,39L44,39L44,0L0,0L0,39ZM3.5,35.5L40.5,35.5L40.5,3.5L3.5,3.5L3.5,35.5Z"
+      android:strokeWidth="1"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="1.1940306E-15"
+          android:startX="22"
+          android:endY="39"
+          android:endX="22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDFAAB7"/>
+        <item android:offset="0.3693551" android:color="#FFA4ACFE"/>
+        <item android:offset="1" android:color="#FF1C9EFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M21.347,25.555C20.935,26.092 20.365,26.498 19.636,26.774C18.907,27.05 18.079,27.188 17.152,27.188C16.199,27.188 15.355,26.972 14.62,26.539C13.886,26.107 13.32,25.489 12.921,24.684C12.523,23.879 12.316,22.94 12.3,21.867L12.3,20.977C12.3,19.258 12.712,17.916 13.535,16.95C14.357,15.983 15.506,15.5 16.98,15.5C18.245,15.5 19.251,15.813 19.995,16.438C20.74,17.063 21.188,17.964 21.339,19.141L19.402,19.141C19.183,17.771 18.389,17.086 17.019,17.086C16.134,17.086 15.46,17.405 14.999,18.043C14.538,18.681 14.3,19.618 14.285,20.852L14.285,21.727C14.285,22.956 14.544,23.91 15.062,24.59C15.58,25.27 16.3,25.61 17.222,25.61C18.232,25.61 18.951,25.381 19.378,24.922L19.378,22.696L17.035,22.696L17.035,21.196L21.347,21.196L21.347,25.555ZM24.54,27.032L24.54,15.657L28.439,15.657C29.725,15.657 30.704,15.914 31.376,16.43C32.048,16.946 32.384,17.714 32.384,18.735C32.384,19.256 32.243,19.724 31.962,20.141C31.681,20.557 31.269,20.881 30.728,21.11C31.343,21.276 31.818,21.59 32.154,22.051C32.49,22.512 32.658,23.065 32.658,23.711C32.658,24.779 32.315,25.599 31.63,26.172C30.945,26.745 29.965,27.032 28.689,27.032L24.54,27.032ZM26.517,21.899L26.517,25.453L28.712,25.453C29.332,25.453 29.816,25.3 30.165,24.993C30.514,24.685 30.689,24.258 30.689,23.711C30.689,22.529 30.085,21.925 28.876,21.899L26.517,21.899ZM26.517,20.446L28.454,20.446C29.069,20.446 29.55,20.306 29.896,20.028C30.242,19.749 30.415,19.354 30.415,18.844C30.415,18.282 30.255,17.875 29.935,17.625C29.615,17.375 29.116,17.25 28.439,17.25L26.517,17.25L26.517,20.446Z"
+      android:strokeWidth="1"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="15.268298"
+          android:startX="22.478058"
+          android:endY="26.90671"
+          android:endX="22.363602"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDFAAB7"/>
+        <item android:offset="0.3693551" android:color="#FFA4ACFE"/>
+        <item android:offset="1" android:color="#FF1C9EFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/app/src/lumen/res/drawable/ic_kb_data_saved_on.xml b/app/src/lumen/res/drawable/ic_kb_data_saved_on.xml
new file mode 100644
index 000000000..4f20112f1
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_kb_data_saved_on.xml
@@ -0,0 +1,61 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="55.28dp"
+    android:height="49dp"
+    android:viewportWidth="44"
+    android:viewportHeight="39">
+  <path
+      android:pathData="M15.8105,22.0859l-1.289,1.367l0,3.547l-1.977,0l0,-11.375l1.977,0l0,5.336l1.094,-1.352l3.328,-3.984l2.39,0l-4.226,5.039l4.469,6.336l-2.344,0z"
+      android:strokeWidth="1"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="0.030932087"
+          android:startX="17.058397"
+          android:endY="39.221046"
+          android:endX="17.058397"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDFAAB7"/>
+        <item android:offset="0.3693551" android:color="#FFA4ACFE"/>
+        <item android:offset="1" android:color="#FF1C9EFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M23.6523,27L23.6523,15.625L27.5503,15.625C28.8373,15.625 29.8163,15.883 30.4883,16.398C31.1603,16.914 31.4963,17.682 31.4963,18.703C31.4963,19.224 31.3553,19.693 31.0743,20.109C30.7933,20.526 30.3813,20.849 29.8393,21.078C30.4543,21.245 30.9293,21.559 31.2653,22.02C31.6013,22.48 31.7693,23.034 31.7693,23.68C31.7693,24.748 31.4273,25.568 30.7423,26.141C30.0573,26.713 29.0763,27 27.8003,27L23.6523,27ZM25.6293,21.867L25.6293,25.422L27.8243,25.422C28.4443,25.422 28.9283,25.268 29.2773,24.961C29.6263,24.654 29.8003,24.227 29.8003,23.68C29.8003,22.498 29.1963,21.893 27.9883,21.867L25.6293,21.867ZM25.6293,20.414L27.5663,20.414C28.1813,20.414 28.6613,20.275 29.0073,19.996C29.3543,19.717 29.5273,19.323 29.5273,18.812C29.5273,18.25 29.3673,17.844 29.0473,17.594C28.7263,17.344 28.2283,17.219 27.5503,17.219L25.6293,17.219L25.6293,20.414Z"
+      android:strokeWidth="1"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="0.38861644"
+          android:startX="27.597935"
+          android:endY="39.055664"
+          android:endX="27.597935"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDFAAB7"/>
+        <item android:offset="0.3693551" android:color="#FFA4ACFE"/>
+        <item android:offset="1" android:color="#FF1C9EFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M0,39L44,39L44,0L0,0L0,39ZM3.5,35.5L40.5,35.5L40.5,3.5L3.5,3.5L3.5,35.5Z"
+      android:strokeWidth="1"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="1.1940306E-15"
+          android:startX="22"
+          android:endY="39"
+          android:endX="22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDFAAB7"/>
+        <item android:offset="0.3693551" android:color="#FFA4ACFE"/>
+        <item android:offset="1" android:color="#FF1C9EFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/app/src/lumen/res/drawable/ic_mb_data_saved_on.xml b/app/src/lumen/res/drawable/ic_mb_data_saved_on.xml
new file mode 100644
index 000000000..0c3a39082
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_mb_data_saved_on.xml
@@ -0,0 +1,43 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="44dp"
+    android:height="39dp"
+    android:viewportWidth="44"
+    android:viewportHeight="39">
+  <path
+      android:pathData="M0,39L44,39L44,0L0,0L0,39ZM3.5,35.5L40.5,35.5L40.5,3.5L3.5,3.5L3.5,35.5Z"
+      android:strokeWidth="1"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startY="1.1940306E-15"
+          android:startX="22"
+          android:endY="39"
+          android:endX="22"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDFAAB7"/>
+        <item android:offset="0.3693551" android:color="#FFA4ACFE"/>
+        <item android:offset="1" android:color="#FF1C9EFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M13.546,16L16.806,24.431L20.059,16L22.598,16L22.598,27L20.641,27L20.641,23.374L20.836,18.523L17.497,27L16.092,27L12.762,18.531L12.956,23.374L12.956,27L11,27L11,16L13.546,16ZM25.934,27L25.934,16L29.808,16C31.086,16 32.059,16.25 32.727,16.748C33.394,17.247 33.728,17.989 33.728,18.977C33.728,19.48 33.588,19.934 33.309,20.336C33.029,20.739 32.62,21.052 32.082,21.273C32.693,21.435 33.165,21.738 33.499,22.184C33.833,22.629 34,23.165 34,23.789C34,24.822 33.659,25.615 32.979,26.169C32.298,26.723 31.324,27 30.056,27L25.934,27ZM27.898,22.037L27.898,25.474L30.079,25.474C30.695,25.474 31.176,25.325 31.523,25.028C31.87,24.731 32.044,24.318 32.044,23.789C32.044,22.646 31.443,22.062 30.242,22.037L27.898,22.037ZM27.898,20.631L29.823,20.631C30.434,20.631 30.911,20.497 31.255,20.227C31.6,19.958 31.772,19.576 31.772,19.083C31.772,18.539 31.612,18.146 31.294,17.904C30.976,17.662 30.481,17.541 29.808,17.541L27.898,17.541L27.898,20.631Z"
+      android:strokeWidth="1"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="2.0721526"
+          android:startX="22.809212"
+          android:endY="37.632183"
+          android:endX="22.809212"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFDFAAB7"/>
+        <item android:offset="0.3693551" android:color="#FFA4ACFE"/>
+        <item android:offset="1" android:color="#FF1C9EFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/app/src/lumen/res/drawable/rounded_corner_solid_button.xml b/app/src/lumen/res/drawable/rounded_corner_solid_button.xml
index 51f7008ac..f14ade2c5 100644
--- a/app/src/lumen/res/drawable/rounded_corner_solid_button.xml
+++ b/app/src/lumen/res/drawable/rounded_corner_solid_button.xml
@@ -3,12 +3,12 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/bond_general_color_blue" />
+        android:color="@color/lumen_color_blue_primary" />
 
     <solid
-        android:color="@color/bond_general_color_blue" />
+        android:color="@color/lumen_color_blue_primary" />
 
     <corners
-        android:radius="5dp" />
+        android:radius="4dp" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/lumen/res/layout/bond_dashboard_footer_view.xml b/app/src/lumen/res/layout/bond_dashboard_footer_view.xml
deleted file mode 100644
index 90683e0a3..000000000
--- a/app/src/lumen/res/layout/bond_dashboard_footer_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/reset"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:layout_centerInParent="true"
-    android:background="@color/primary_color"
-    android:gravity="center"
-    android:paddingStart="20dp"
-    android:paddingLeft="20dp"
-    android:paddingTop="10dp"
-    android:paddingEnd="20dp"
-    android:paddingRight="20dp"
-    android:paddingBottom="10dp"
-    android:text="@string/reset_statistics"
-    android:textColor="@color/white" />
\ No newline at end of file
diff --git a/app/src/lumen/res/layout/bond_dashboard_fragment.xml b/app/src/lumen/res/layout/bond_dashboard_fragment.xml
index 0a2827b71..7b11d38d8 100644
--- a/app/src/lumen/res/layout/bond_dashboard_fragment.xml
+++ b/app/src/lumen/res/layout/bond_dashboard_fragment.xml
@@ -1,15 +1,212 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright © Cliqz 2018-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright © Cliqz 2019-->
+<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/bond_dashboard_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/primary_color"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:ignore="ContentDescription">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/dashboard_list_view"
+    <View
+        android:id="@+id/vertical_line"
+        android:layout_width="0.4dp"
+        android:layout_height="0dp"
+        android:background="@color/lumen_color_blue_primary_opaque"
+        app:layout_constraintBottom_toBottomOf="@+id/phishing_checked_text"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/trackers_detected_icon" />
+
+    <View
+        android:id="@+id/horizontal_line"
+        android:layout_width="0dp"
+        android:layout_height="0.4dp"
+        android:background="@color/lumen_color_blue_primary_opaque"
+        app:layout_constraintBottom_toBottomOf="@id/reset"
+        app:layout_constraintEnd_toEndOf="@id/trackers_detected_text"
+        app:layout_constraintStart_toStartOf="@id/ads_blocked_text"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.45" />
+
+    <ImageView
+        android:id="@+id/ads_blocked_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/ads_blocked"
+        app:layout_constraintEnd_toEndOf="@+id/ads_blocked"
+        app:layout_constraintStart_toStartOf="@+id/ads_blocked"
+        app:srcCompat="@drawable/ic_adblock_on" />
+
+    <TextView
+        android:id="@+id/ads_blocked"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:textColor="@android:color/white"
+        android:textSize="28sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/ads_blocked_text"
+        app:layout_constraintEnd_toEndOf="@+id/ads_blocked_text"
+        app:layout_constraintStart_toStartOf="@+id/ads_blocked_text"
+        tools:text="13" />
+
+    <TextView
+        android:id="@+id/ads_blocked_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="25dp"
+        android:layout_marginEnd="25dp"
+        android:layout_marginBottom="20dp"
+        android:gravity="center"
+        android:minLines="2"
+        android:text="@string/bond_dashboard_ads_blocked_title"
+        android:textColor="@android:color/white"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toTopOf="@+id/horizontal_line"
+        app:layout_constraintEnd_toStartOf="@+id/vertical_line"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="Datensammler blockiert" />
+
+    <ImageView
+        android:id="@+id/trackers_detected_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/trackers_detected"
+        app:layout_constraintEnd_toEndOf="@+id/trackers_detected"
+        app:layout_constraintStart_toStartOf="@+id/trackers_detected"
+        app:srcCompat="@drawable/ic_antitracking_on" />
+
+    <TextView
+        android:id="@+id/trackers_detected"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:textColor="@android:color/white"
+        android:textSize="28sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/trackers_detected_text"
+        app:layout_constraintEnd_toEndOf="@+id/trackers_detected_text"
+        app:layout_constraintStart_toStartOf="@+id/trackers_detected_text"
+        tools:text="20" />
+
+    <TextView
+        android:id="@+id/trackers_detected_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="25dp"
+        android:layout_marginEnd="25dp"
+        android:layout_marginBottom="20dp"
+        android:gravity="center"
+        android:minLines="2"
+        android:text="@string/bond_dashboard_tracking_companies_title"
+        android:textColor="@android:color/white"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toTopOf="@+id/horizontal_line"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/vertical_line"
+        tools:text="@string/bond_dashboard_tracking_companies_title" />
+
+    <ImageView
+        android:id="@+id/data_saved_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toEndOf="@+id/data_saved"
+        app:layout_constraintStart_toStartOf="@+id/data_saved"
+        app:layout_constraintTop_toBottomOf="@id/horizontal_line"
+        app:srcCompat="@drawable/ic_kb_data_saved_on" />
+
+    <TextView
+        android:id="@+id/data_saved"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:textColor="@android:color/white"
+        android:textSize="28sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="@+id/data_saved_text"
+        app:layout_constraintStart_toStartOf="@+id/data_saved_text"
+        app:layout_constraintTop_toBottomOf="@+id/data_saved_icon"
+        tools:text="1,5" />
+
+    <TextView
+        android:id="@+id/data_saved_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="25dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="25dp"
+        android:gravity="center"
+        android:minLines="2"
+        android:text="@string/bond_dashboard_data_saved_title"
+        android:textColor="@android:color/white"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toBottomOf="@+id/phishing_checked_text"
+        app:layout_constraintEnd_toStartOf="@+id/vertical_line"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/data_saved" />
+
+
+    <ImageView
+        android:id="@+id/phishing_checked_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toEndOf="@+id/phishing_checked"
+        app:layout_constraintStart_toStartOf="@+id/phishing_checked"
+        app:layout_constraintTop_toBottomOf="@id/horizontal_line"
+        app:srcCompat="@drawable/ic_antiphishing_on" />
+
+    <TextView
+        android:id="@+id/phishing_checked"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:textColor="@android:color/white"
+        android:textSize="28sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="@+id/phishing_checked_text"
+        app:layout_constraintStart_toStartOf="@+id/phishing_checked_text"
+        app:layout_constraintTop_toBottomOf="@+id/phishing_checked_icon"
+        tools:text="12" />
+
+    <TextView
+        android:id="@+id/phishing_checked_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="25dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="25dp"
+        android:gravity="center"
+        android:minLines="2"
+        android:text="@string/bond_dashboard_phishing_protection_title"
+        android:textColor="@android:color/white"
+        android:textSize="15sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/vertical_line"
+        app:layout_constraintTop_toBottomOf="@id/phishing_checked" />
+
+    <TextView
+        android:id="@+id/reset"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="16dp" />
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerInParent="true"
+        android:layout_marginBottom="8dp"
+        android:background="@color/primary_color"
+        android:gravity="center"
+        android:paddingTop="15dp"
+        android:paddingBottom="15dp"
+        android:text="@string/reset_statistics"
+        android:textAllCaps="true"
+        android:textColor="@color/lumen_color_blue_primary"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/vertical_line"
+        app:layout_constraintVertical_bias="1" />
 
-</FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/lumen/res/layout/control_center_layout.xml b/app/src/lumen/res/layout/control_center_layout.xml
index 8bbe10305..0a37240c4 100644
--- a/app/src/lumen/res/layout/control_center_layout.xml
+++ b/app/src/lumen/res/layout/control_center_layout.xml
@@ -50,12 +50,4 @@
         android:layout_below="@+id/control_center_tab_layout"
         android:background="@android:color/transparent" />
 
-    <View
-        android:id="@+id/dashboard_disable_overlay"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/dark_transparent_overlay"
-        android:layout_below="@+id/subscribe_ultimate_protection"
-        android:visibility="gone" />
-
 </RelativeLayout>
diff --git a/app/src/lumen/res/layout/dashboard_item1.xml b/app/src/lumen/res/layout/dashboard_item1.xml
deleted file mode 100644
index 0837b3e2d..000000000
--- a/app/src/lumen/res/layout/dashboard_item1.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © Cliqz 2019 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/dashboard_item_layout"
-    android:layout_width="match_parent"
-    android:layout_height="150dp"
-    android:background="@drawable/dashboard_item_background"
-    android:baselineAligned="false"
-    android:orientation="vertical"
-    android:gravity="center_vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:baselineAligned="false"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.4"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <ImageView
-                android:id="@+id/item_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                tools:src="@drawable/ic_anti_phishing_hook_enabled" />
-
-            <TextView
-                android:layout_marginTop="5dp"
-                android:id="@+id/item_measurement_value"
-                style="@style/dashboard_measurement_value"
-                tools:text="GB" />
-
-            <TextView
-                android:id="@+id/item_measurement_unit"
-                style="@style/dashboard_measurement_value"
-                tools:text="GB" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.6"
-            android:gravity="center_vertical"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/item_title"
-                style="@style/dashboard_item_title"
-                android:textAlignment="textStart"
-                tools:text="Item Title" />
-
-            <TextView
-                android:id="@+id/item_content"
-                style="@style/dashboard_item_content"
-                android:textAlignment="textStart"
-                tools:text="Item content is written here" />
-
-        </LinearLayout>
-    </LinearLayout>
-
-    <TextView
-        android:visibility="gone"
-        android:id="@+id/item_money_bar_value"
-        style="@style/dashboard_item_content"
-        android:layout_marginTop="20dp"
-        tools:text="15 €" />
-
-    <SeekBar
-        android:visibility="gone"
-        android:id="@+id/item_money_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:max="495"
-        android:progressTint="#00aef0" />
-
-</LinearLayout>
diff --git a/app/src/lumen/res/layout/dashboard_item2.xml b/app/src/lumen/res/layout/dashboard_item2.xml
deleted file mode 100644
index b254b9e1c..000000000
--- a/app/src/lumen/res/layout/dashboard_item2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © Cliqz 2019 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:baselineAligned="false"
-    android:orientation="horizontal">
-
-    <include
-        android:id="@+id/left_item"
-        layout="@layout/dashboard_item2_structure"
-        android:layout_width="0dp"
-        android:layout_height="230dp"
-        android:layout_weight=".5" />
-
-    <include
-        android:id="@+id/right_item"
-        layout="@layout/dashboard_item2_structure"
-        android:layout_width="0dp"
-        android:layout_height="230dp"
-        android:layout_weight=".5" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/lumen/res/layout/dashboard_item2_structure.xml b/app/src/lumen/res/layout/dashboard_item2_structure.xml
deleted file mode 100644
index d9b7383c3..000000000
--- a/app/src/lumen/res/layout/dashboard_item2_structure.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright © Cliqz 2019 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/dashboard_item_layout"
-    android:layout_width="wrap_content"
-    android:layout_height="230dp"
-    android:background="@drawable/dashboard_item_background">
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/item_title"
-        android:layout_centerHorizontal="true">
-
-        <TextView
-            android:id="@+id/item_measurement"
-            style="@style/dashboard_measurement_value"
-            android:drawablePadding="5dp"
-            android:layout_gravity="center"
-            android:textSize="25sp"
-            tools:background="@drawable/ic_time_circle_enabled"
-            tools:text="225\nMIN" />
-
-    </FrameLayout>
-
-    <TextView
-        android:id="@+id/item_title"
-        style="@style/dashboard_item_title"
-        android:layout_alignParentBottom="true"
-        android:layout_marginTop="16dp"
-        android:paddingBottom="10dp"
-        tools:text="Item Title" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/lumen/res/layout/subscribe_ultimate_protection_view.xml b/app/src/lumen/res/layout/subscribe_ultimate_protection_view.xml
index 81bf788a7..dd8076ad5 100644
--- a/app/src/lumen/res/layout/subscribe_ultimate_protection_view.xml
+++ b/app/src/lumen/res/layout/subscribe_ultimate_protection_view.xml
@@ -4,18 +4,27 @@
     android:id="@+id/subscribe_ultimate_protection"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/primary_color"
+    android:background="@color/lumen_color_background"
     android:orientation="horizontal">
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/vertical_guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.6" />
+
     <TextView
         android:id="@+id/subscribe_ultimate_protection_title"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:layout_marginTop="12dp"
         android:text="@string/non_subscriber_ultimate_protection"
         android:textColor="@color/white"
+        android:textSize="16sp"
         android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/vertical_guideline"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -24,31 +33,32 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="12dp"
-        android:paddingEnd="8dp"
-        android:paddingStart="0dp"
         android:maxLines="3"
         android:text="@string/non_subscriber_ultimate_protection_desc"
         android:textColor="@color/white"
+        android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/subscribe_ultimate_protection_btn"
+        app:layout_constraintEnd_toEndOf="@+id/vertical_guideline"
         app:layout_constraintStart_toStartOf="@+id/subscribe_ultimate_protection_title"
         app:layout_constraintTop_toBottomOf="@+id/subscribe_ultimate_protection_title" />
 
     <Button
         android:id="@+id/subscribe_ultimate_protection_btn"
         android:layout_width="wrap_content"
-        android:paddingStart="15dp"
-        android:paddingRight="15dp"
-        android:paddingEnd="15dp"
-        android:paddingLeft="15dp"
-        android:layout_height="32dp"
-        android:layout_marginEnd="12dp"
+        android:layout_height="42dp"
+        android:layout_marginEnd="26dp"
         android:background="@drawable/rounded_corner_solid_button"
+        android:paddingStart="18dp"
+        android:paddingLeft="18dp"
+        android:paddingEnd="18dp"
+        android:paddingRight="18dp"
         android:text="@string/non_subscriber_ultimate_protection_button"
         android:textAllCaps="true"
         android:textColor="@color/white"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1"
         app:layout_constraintStart_toEndOf="@+id/subscribe_ultimate_protection_desc"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/lumen/res/values/colors.xml b/app/src/lumen/res/values/colors.xml
index 4f7c20887..1e3b6f626 100644
--- a/app/src/lumen/res/values/colors.xml
+++ b/app/src/lumen/res/values/colors.xml
@@ -43,4 +43,6 @@
     <color name="lumen_color_blue_primary">#1B9CFC</color>
     <color name="lumen_color_background">#0D1429</color>
     <color name="lumen_color_grey_text">#80FFFFFF</color>
+    <color name="lumen_disabled_gray">#4E5363</color>
+    <color name="lumen_color_blue_primary_opaque">#801B9CFC</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/lumen/res/values/styles.xml b/app/src/lumen/res/values/styles.xml
index 906d214c1..6a6295e72 100644
--- a/app/src/lumen/res/values/styles.xml
+++ b/app/src/lumen/res/values/styles.xml
@@ -12,7 +12,6 @@
     <style name="tab_layout_text_style">
         <item name="android:textSize">16sp</item>
         <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">@color/bond_general_color_blue</item>
     </style>
 
     <style name="required_items">

From b8f78e0b2e8b48c55d228abf44cda5aff0790511 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Thu, 4 Jul 2019 17:41:45 +0200
Subject: [PATCH 17/57] AP-328 removes the CoordinatorLayout (#145)

---
 app/src/main/res/layout/fragment_base.xml | 6 ++++++
 gradle.properties                         | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_base.xml b/app/src/main/res/layout/fragment_base.xml
index 826c04e33..c250b1a6e 100644
--- a/app/src/main/res/layout/fragment_base.xml
+++ b/app/src/main/res/layout/fragment_base.xml
@@ -5,7 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <!-- TODO restore the coordinator layout by extracting the freshtab from the TabFragment
     <androidx.coordinatorlayout.widget.CoordinatorLayout
+    -->
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
@@ -67,7 +70,10 @@
             android:background="@color/white"
             tools:visibility="gone"
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+    </LinearLayout>
+    <!-- TODO restore the CoordinatorLayout, see above
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
+    -->
     <!--add views which are fixed to the bottom of the screen here-->
 
     <LinearLayout
diff --git a/gradle.properties b/gradle.properties
index 0995c3ecb..5387c4a56 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,6 +2,5 @@ android.builder.sdkDownload=false
 org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms1024m -Xmx4096m
-android.enableSeparateAnnotationProcessing=true
 android.useAndroidX=true
 android.enableJetifier=true

From e03b6ec7f965114a43d31ba7760cea98bc4a561f Mon Sep 17 00:00:00 2001
From: Jayesh Solanki <jayeshsolanki93@gmail.com>
Date: Fri, 5 Jul 2019 10:09:04 +0200
Subject: [PATCH 18/57] AP-364 Add Restore Subscription option (#146)

* AP-360 Implement design changes on subscription screen

* AP-357 Implement design changes on dashboard

* Remove ControlCenterDialog abstract class

* AP-364 Implement restore subscription feature
---
 .../BaseControlCenterPagerAdapter.java        |  40 -------
 .../controlcenter/ControlCenterDialog.java    |   6 +-
 .../ControlCenterPagerAdapter.java            |  42 +++++++-
 .../controlcenter/DashboardFragment.kt        |   8 --
 .../browser/purchases/PurchaseFragment.kt     | 102 +++++++++++++-----
 .../browser/purchases/PurchasesManager.kt     |  10 +-
 .../purchases/SubscriptionConstants.kt        |  10 +-
 .../productlist/ProductListAdapter.kt         |   8 +-
 .../lumen/res/layout/fragment_purchase.xml    |  29 ++++-
 app/src/lumen/res/values/strings.xml          |   8 ++
 10 files changed, 168 insertions(+), 95 deletions(-)
 delete mode 100644 app/src/lumen/java/com/cliqz/browser/controlcenter/BaseControlCenterPagerAdapter.java

diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/BaseControlCenterPagerAdapter.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/BaseControlCenterPagerAdapter.java
deleted file mode 100644
index 579d6bf87..000000000
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/BaseControlCenterPagerAdapter.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.cliqz.browser.controlcenter;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Copyright © Cliqz 2019
- *
- * Abstraction layer for Control center adapter for different flavours
- */
-public abstract class BaseControlCenterPagerAdapter extends FragmentPagerAdapter {
-
-    final List<DashboardFragment> mFragmentList = new ArrayList<>();
-
-    BaseControlCenterPagerAdapter(FragmentManager fm) {
-        super(fm);
-    }
-
-    @Override
-    public Fragment getItem(int position) {
-        return mFragmentList.get(position);
-    }
-
-    public int getCount() {
-        return mFragmentList.size();
-    }
-
-    public CharSequence getPageTitle(int position) {
-        return mFragmentList.get(position).getTitle();
-    }
-
-    void updateViewComponent(int position, boolean optionValue) {
-        mFragmentList.get(position).refreshUIComponent(optionValue);
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
index 9dc9630f8..830434739 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
@@ -140,7 +140,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                 container, false);
         ButterKnife.bind(this, view);
 
-        mControlCenterPagerAdapter = new ControlCenterPagerAdapter(getChildFragmentManager());
+        mControlCenterPagerAdapter = new ControlCenterPagerAdapter(getChildFragmentManager(), context);
         mControlCenterPagerAdapter.init();
         controlCenterPager.setAdapter(mControlCenterPagerAdapter);
         controlCenterTabLayout.setupWithViewPager(controlCenterPager);
@@ -208,13 +208,13 @@ private void toggleTabLayout(boolean isEnabled) {
         final Context context = getContext();
         if (isEnabled) {
             controlCenterTabLayout.setSelectedTabIndicatorColor(
-                    ContextCompat.getColor(context,R.color.bond_general_color_blue));
+                    ContextCompat.getColor(context, R.color.bond_general_color_blue));
             controlCenterTabLayout.setTabTextColors(
                     ContextCompat.getColor(context, R.color.bond_disabled_text_color),
                     ContextCompat.getColor(context, R.color.bond_general_color_blue));
         } else {
             controlCenterTabLayout.setSelectedTabIndicatorColor(
-                    ContextCompat.getColor(context,R.color.lumen_color_grey_text));
+                    ContextCompat.getColor(context, R.color.lumen_color_grey_text));
             controlCenterTabLayout.setTabTextColors(
                     ContextCompat.getColor(context, R.color.lumen_color_grey_text),
                     ContextCompat.getColor(context, R.color.lumen_color_grey_text));
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterPagerAdapter.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterPagerAdapter.java
index 148ee09b2..759572b43 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterPagerAdapter.java
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterPagerAdapter.java
@@ -1,18 +1,37 @@
 package com.cliqz.browser.controlcenter;
 
+import android.content.Context;
 import android.os.Bundle;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+
+import com.cliqz.browser.R;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Copyright © Cliqz 2019
  */
-public class ControlCenterPagerAdapter extends BaseControlCenterPagerAdapter {
+public class ControlCenterPagerAdapter extends FragmentPagerAdapter {
 
     static final String IS_TODAY = "is_daily";
 
-    ControlCenterPagerAdapter(FragmentManager fm) {
+    private final Context mContext;
+
+    final List<DashboardFragment> mFragmentList = new ArrayList<>();
+
+    ControlCenterPagerAdapter(FragmentManager fm, Context context) {
         super(fm);
+        this.mContext = context;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return mFragmentList.get(position);
     }
 
     public void init() {
@@ -27,4 +46,23 @@ public void init() {
         mFragmentList.add(dashboardTodayFragment);
         mFragmentList.add(dashboardWeekFragment);
     }
+
+    @Override
+    public int getCount() {
+        return mFragmentList.size();
+    }
+
+    @Nullable
+    @Override
+    public CharSequence getPageTitle(int position) {
+        if (position == 0) {
+            return mContext.getString(R.string.bond_dashboard_today_title);
+        } else {
+            return mContext.getString(R.string.bond_dashboard_week_title);
+        }
+    }
+
+    void updateViewComponent(int position, boolean optionValue) {
+        mFragmentList.get(position).refreshUIComponent(optionValue);
+    }
 }
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt b/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt
index 6ece9b241..3d3292367 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt
@@ -70,14 +70,6 @@ class DashboardFragment : Fragment() {
         updateUI()
     }
 
-    fun getTitle(): String {
-        return if (isDailyView) {
-            context!!.getString(R.string.bond_dashboard_today_title)
-        } else {
-            context!!.getString(R.string.bond_dashboard_week_title)
-        }
-    }
-
     fun updateUI() {
         val periodType = if (isDailyView) "day" else "week"
         insights.getInsightsData({
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
index 47e8a3ab5..ecdd56089 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
@@ -11,6 +11,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import com.android.billingclient.api.BillingClient
 
 import com.cliqz.browser.R
@@ -23,7 +24,8 @@ import com.cliqz.browser.purchases.productlist.ProductRowData
 import com.revenuecat.purchases.interfaces.ReceiveEntitlementsListener
 import kotlinx.android.synthetic.lumen.fragment_purchase.*
 import com.cliqz.browser.purchases.SubscriptionConstants.Entitlements
-import com.cliqz.browser.purchases.SubscriptionConstants.Product
+import com.cliqz.browser.purchases.SubscriptionConstants.ProductId
+import com.cliqz.browser.purchases.SubscriptionConstants.ProductName
 import com.cliqz.nove.Bus
 import com.revenuecat.purchases.*
 import java.util.*
@@ -58,15 +60,29 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
         super.onViewCreated(view, savedInstanceState)
         BrowserApp.getActivityComponent(activity as MainActivity)?.inject(this)
         close_btn.setOnClickListener { dismiss() }
-        initRecyclerView()
+        initializeViews()
         setLoading(true)
         getProductDetails()
     }
 
-    private fun initRecyclerView() {
+    private fun initializeViews() {
         mAdapter = ProductListAdapter(context, null, this)
         product_list.adapter = mAdapter
         product_list.layoutManager = LinearLayoutManager(context)
+
+        restore_purchase.setOnClickListener {
+            checkExistingPurchases(
+                    onSuccess = { activeSku ->
+                        enableFeatures(activeSku)
+                        Toast.makeText(context, getString(R.string.restore_subscription_success),
+                                Toast.LENGTH_LONG).show()
+                    },
+                    onError = {
+                        Toast.makeText(context, R.string.restore_subscription_error_msg,
+                                Toast.LENGTH_LONG).show()
+                    }
+            )
+        }
     }
 
     private fun getProductDetails() {
@@ -115,82 +131,103 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
     private fun customSwapProductListElements(productList: List<ProductRowData>) {
         if (productList.size < 2) return
         val middleElement = productList[1]
-        val basicVpnProductElement: ProductRowData = productList.find { it.sku == Product.BASIC_VPN }
-                ?: return
+        val basicVpnProductElement: ProductRowData = productList.find {
+            it.sku in setOf(ProductId.BASIC_VPN, ProductId.BASIC_VPN_STAGING)
+        } ?: return
         Collections.swap(productList, productList.indexOf(basicVpnProductElement), productList.indexOf(middleElement))
     }
 
     fun setLoading(flag: Boolean) {
         product_list.visibility = if (flag) View.GONE else View.VISIBLE
         loading.visibility = if (flag) View.VISIBLE else View.GONE
+        restore_purchase.visibility = if (flag || purchasesManager.purchase.isASubscriber) {
+            View.GONE
+        } else {
+            View.VISIBLE
+        }
     }
 
     override fun onBuyClicked(position: Int) {
         mAdapter.getProduct(position)?.apply {
-            restoreExistingPurchase({ activeSku ->
-                if (activeSku == sku) {
-                    Toast.makeText(context, "You are already subscribed to this package", Toast.LENGTH_LONG).show()
-                    // TODO: Can remove this line and provide a restore button.
-                    enableFeatures(sku)
-                } else {
-                    makePurchase(sku)
-                }
-            }, {
-                makePurchase(sku)
-            })
+            checkExistingPurchases(
+                    onSuccess = { activeSku -> showRestorePurchasesDialog(sku = activeSku) },
+                    onError = { makePurchase(sku) }
+            )
         }
     }
 
-    private fun restoreExistingPurchase(success: (sku: String) -> Unit, cannotRestore: () -> Unit) {
+    private fun checkExistingPurchases(onSuccess: (activeSku: String) -> Unit, onError: () -> Unit) {
+        if (purchasesManager.purchase.sku.isNotEmpty()) {
+            onError()
+            return
+        }
         Purchases.sharedInstance.restorePurchasesWith(
-                {
+                onError = {
                     Log.w(TAG, it.message)
-                    cannotRestore()
+                    onError()
                 },
-                {
+                onSuccess = {
                     if (it.activeSubscriptions.isEmpty()) {
-                        cannotRestore()
+                        onError()
                     } else {
-                        success(it.activeSubscriptions.first())
+                        onSuccess(it.activeSubscriptions.first())
                     }
                 }
         )
     }
 
+    private fun showRestorePurchasesDialog(sku: String) {
+        val productName = getProductNameById(sku)
+        AlertDialog.Builder(context!!)
+                .setTitle(R.string.restore_subscription_dialog_title)
+                .setMessage(getString(R.string.restore_subscription_dialog_desc, productName))
+                .setPositiveButton(R.string.restore_subscription_dialog_positive_btn) { _, _ ->
+                    enableFeatures(sku)
+                    Toast.makeText(context, getString(R.string.restore_subscription_success),
+                            Toast.LENGTH_LONG).show()
+                }
+                .setNegativeButton(R.string.cancel, null)
+                .show()
+    }
+
     private fun makePurchase(sku: String) {
         val oldSku = ArrayList<String>()
         if (purchasesManager.purchase.sku.isNotEmpty()) {
             oldSku.add(purchasesManager.purchase.sku)
         }
-        Purchases.sharedInstance.makePurchaseWith(activity as Activity, sku,
-                BillingClient.SkuType.SUBS, oldSku,
-                { error, userCancelled ->
+        Purchases.sharedInstance.makePurchaseWith(
+                activity as Activity,
+                sku,
+                BillingClient.SkuType.SUBS,
+                oldSku,
+                onError = { error, userCancelled ->
                     if (!userCancelled) {
                         Log.e(TAG, "${error.underlyingErrorMessage}")
                         Toast.makeText(context, error.message, Toast.LENGTH_LONG).show()
                     }
                 },
-                { purchase, _ ->
+                onSuccess = { purchase, _ ->
                     enableFeatures(purchase.sku)
+                    Toast.makeText(context, "Purchase complete!", Toast.LENGTH_SHORT).show()
                 }
         )
     }
 
     private fun enableFeatures(sku: String) {
         when (sku) {
-            Product.BASIC_VPN, Product.BASIC_VPN_STAGING -> {
+            ProductId.BASIC_VPN, ProductId.BASIC_VPN_STAGING -> {
                 purchasesManager.purchase.isVpnEnabled = true
                 purchasesManager.purchase.isDashboardEnabled = true
                 preferenceManager.isAttrackEnabled = true
                 preferenceManager.adBlockEnabled = true
             }
-            Product.BASIC, Product.BASIC_STAGING -> {
+            ProductId.BASIC, ProductId.BASIC_STAGING -> {
                 purchasesManager.purchase.isVpnEnabled = false
                 purchasesManager.purchase.isDashboardEnabled = true
                 preferenceManager.isAttrackEnabled = true
                 preferenceManager.adBlockEnabled = true
             }
-            Product.VPN, Product.VPN_STAGING -> {
+            ProductId.VPN, ProductId.VPN_STAGING -> {
                 purchasesManager.purchase.isVpnEnabled = true
                 purchasesManager.purchase.isDashboardEnabled = false
                 preferenceManager.isAttrackEnabled = false
@@ -202,4 +239,11 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
         bus.post(Messages.PurchaseCompleted())
         dismiss()
     }
+
+    private fun getProductNameById(sku: String) = when (sku) {
+        ProductId.BASIC, ProductId.BASIC_STAGING -> ProductName.BASIC
+        ProductId.VPN, ProductId.VPN_STAGING -> ProductName.VPN
+        ProductId.BASIC_VPN, ProductId.BASIC_VPN_STAGING -> ProductName.BASIC_VPN
+        else -> IllegalArgumentException("Invalid product id $sku")
+    }
 }
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
index 11cc07522..3b7327828 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
@@ -4,7 +4,7 @@ import acr.browser.lightning.preference.PreferenceManager
 import android.content.Context
 import android.util.Log
 import com.cliqz.browser.main.Messages
-import com.cliqz.browser.purchases.SubscriptionConstants.Product
+import com.cliqz.browser.purchases.SubscriptionConstants.ProductId
 import com.cliqz.browser.purchases.trial.ServerData
 import com.cliqz.browser.purchases.trial.TrialPeriodLocalRepo
 import com.cliqz.browser.purchases.trial.TrialPeriodRemoteRepo
@@ -44,10 +44,10 @@ class PurchasesManager(
         if (purchaserInfo.activeSubscriptions.isNotEmpty()) {
             // If subscribed, enable features.
             for (sku in purchaserInfo.activeSubscriptions) {
-                val isVpnEnabled = sku in setOf(Product.VPN, Product.VPN_STAGING, Product.BASIC_VPN,
-                        Product.BASIC_VPN_STAGING)
-                val isDashboardEnabled = sku in setOf(Product.BASIC, Product.BASIC_STAGING,
-                        Product.BASIC_VPN, Product.BASIC_VPN_STAGING)
+                val isVpnEnabled = sku in setOf(ProductId.VPN, ProductId.VPN_STAGING,
+                        ProductId.BASIC_VPN, ProductId.BASIC_VPN_STAGING)
+                val isDashboardEnabled = sku in setOf(ProductId.BASIC, ProductId.BASIC_STAGING,
+                        ProductId.BASIC_VPN, ProductId.BASIC_VPN_STAGING)
                 purchase.apply {
                     this.isASubscriber = true
                     this.isVpnEnabled = isVpnEnabled
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/SubscriptionConstants.kt b/app/src/lumen/java/com/cliqz/browser/purchases/SubscriptionConstants.kt
index ef9df94dc..788f6f2a7 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/SubscriptionConstants.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/SubscriptionConstants.kt
@@ -8,9 +8,9 @@ class SubscriptionConstants {
     }
 
     /**
-     * Product ID on RevenueCat and Google Play Console.
+     * ProductId on RevenueCat and Google Play Console.
      */
-    internal object Product {
+    internal object ProductId {
         const val BASIC = "com.cliqz.android.lumen.sale.basic"
         const val VPN = "com.cliqz.android.lumen.sale.vpn"
         const val BASIC_VPN = "com.cliqz.android.lumen.sale.basic_vpn"
@@ -20,4 +20,10 @@ class SubscriptionConstants {
         const val BASIC_VPN_STAGING = "com.cliqz.android.lumen.staging.sale.basic_vpn"
     }
 
+    internal object ProductName {
+        const val BASIC = "Basic Monthly"
+        const val VPN = "VPN Monthly"
+        const val BASIC_VPN = "Basic + VPN Monthly"
+    }
+
 }
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/productlist/ProductListAdapter.kt b/app/src/lumen/java/com/cliqz/browser/purchases/productlist/ProductListAdapter.kt
index b3631b7c3..ec98273f5 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/productlist/ProductListAdapter.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/productlist/ProductListAdapter.kt
@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.cliqz.browser.R
-import com.cliqz.browser.purchases.SubscriptionConstants.Product
+import com.cliqz.browser.purchases.SubscriptionConstants.ProductId
 import kotlinx.android.synthetic.lumen.subscription_product_row_default.view.*
 
 interface OnBuyClickListener {
@@ -47,7 +47,11 @@ class ProductListAdapter(private val context: Context?,
 
     override fun getItemViewType(position: Int): Int {
         return mListData?.let {
-            if (it[position].sku == Product.BASIC_VPN) LAYOUT_HIGHLIGHTED else LAYOUT_DEFAULT
+            if (it[position].sku in setOf(ProductId.BASIC_VPN, ProductId.BASIC_VPN_STAGING)) {
+                LAYOUT_HIGHLIGHTED
+            } else {
+                LAYOUT_DEFAULT
+            }
         } ?: LAYOUT_DEFAULT
     }
 
diff --git a/app/src/lumen/res/layout/fragment_purchase.xml b/app/src/lumen/res/layout/fragment_purchase.xml
index 8aff3d6fc..92d6eef44 100644
--- a/app/src/lumen/res/layout/fragment_purchase.xml
+++ b/app/src/lumen/res/layout/fragment_purchase.xml
@@ -14,10 +14,11 @@
         android:layout_marginTop="32dp"
         android:layout_marginEnd="16dp"
         android:background="@color/transparent"
+        android:tint="@android:color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:tint="@android:color/white"
-        app:srcCompat="@drawable/ic_clear_black" />
+        app:srcCompat="@drawable/ic_clear_black"
+        tools:ignore="ContentDescription" />
 
     <ProgressBar
         android:id="@+id/loading"
@@ -39,12 +40,32 @@
         android:layout_gravity="center"
         android:layout_marginTop="28dp"
         android:padding="2dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/restore_purchase"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/close_btn"
-        app:layout_constraintVertical_bias="1.0"
+        app:layout_constraintVertical_bias="0.0"
         tools:listitem="@layout/subscription_product_row_default" />
 
+    <TextView
+        android:id="@+id/restore_purchase"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/primary_color"
+        android:gravity="center"
+        android:paddingTop="15dp"
+        android:paddingBottom="15dp"
+        android:text="@string/restore_subscription"
+        android:textAllCaps="true"
+        android:textColor="@color/lumen_color_blue_primary"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/product_list"
+        app:layout_constraintVertical_bias="1"
+        tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/lumen/res/values/strings.xml b/app/src/lumen/res/values/strings.xml
index 769773422..836136280 100644
--- a/app/src/lumen/res/values/strings.xml
+++ b/app/src/lumen/res/values/strings.xml
@@ -101,4 +101,12 @@
     <string name="subscription_product_row_highlighted">Best offer\nLimited Time Only</string>
     <string name="per_month_text">%1$s / MONTH</string>
 
+    <!-- Restore Subscription -->
+    <string name="restore_subscription">Restore Subscription</string>
+    <string name="restore_subscription_dialog_title">Restore subscriptions?</string>
+    <string name="restore_subscription_dialog_desc">You already have a subscription for package %1$s </string>
+    <string name="restore_subscription_dialog_positive_btn">Restore</string>
+    <string name="restore_subscription_error_msg">Nothing to restore</string>
+    <string name="restore_subscription_success">Subscription restored</string>
+
 </resources>

From 5c4e4e732183eb50ac801bd8b4e33ecb11a89729 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Mon, 8 Jul 2019 16:23:21 +0200
Subject: [PATCH 19/57] AP-395 make use of the right url bar color in forget
 tab (#150)

---
 app/src/main/java/com/cliqz/browser/widget/SearchBar.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/cliqz/browser/widget/SearchBar.java b/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
index 0d15ae69a..c6b02fd86 100644
--- a/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
+++ b/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
@@ -379,12 +379,12 @@ public void setStyle(boolean isIncognito) {
                 searchEditText.setTextColor(ContextCompat.getColor(context, R.color.url_bar_text_color_incognito));
                 searchEditText.setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_incognito));
                 titleBar.setTextColor(ContextCompat.getColor(context, R.color.url_bar_text_color_incognito));
-                setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_incognito));
+                titleBar.setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_incognito));
             } else {
                 searchEditText.setTextColor(ContextCompat.getColor(context, R.color.url_bar_text_color_normal));
                 searchEditText.setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_normal));
                 titleBar.setTextColor(ContextCompat.getColor(context, R.color.url_bar_text_color_normal));
-                setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_normal));
+                titleBar.setBackgroundColor(ContextCompat.getColor(context, R.color.url_bar_bg_normal));
             }
         }
     }

From d756e9a1d12e587cc37d943b68182ec962b95fd7 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Mon, 8 Jul 2019 17:31:41 +0200
Subject: [PATCH 20/57] AP-389 adds Tabs menu entry for Lumen (#151)

---
 .../java/com/cliqz/browser/widget/OverFlowMenu.java   | 11 +++++++++++
 app/src/main/res/values/ids.xml                       |  1 +
 2 files changed, 12 insertions(+)

diff --git a/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java b/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java
index 350a7e7de..aa4a713dc 100644
--- a/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java
+++ b/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java
@@ -92,6 +92,7 @@ private enum Entries {
         ACTIONS(EntryType.ACTIONS, -1, -1),
         NEW_TAB(EntryType.REGULAR, R.id.new_tab_menu_button, R.string.action_new_tab),
         NEW_INCOGNITO_TAB(EntryType.REGULAR, R.id.new_incognito_tab_menu_button, R.string.action_incognito),
+        TABS(EntryType.REGULAR, R.id.tabs_menu_button, R.string.tabs_word),
         GO_TO_FAVORITES(EntryType.REGULAR, R.id.go_to_favorites_button, R.string.favorites),
 
         SEARCH_IN_PAGE(EntryType.REGULAR, R.id.search_on_page_menu_button, R.string.action_search_on_page),
@@ -118,6 +119,7 @@ private enum Entries {
             Entries.ACTIONS,
             Entries.NEW_TAB,
             Entries.NEW_INCOGNITO_TAB,
+            Entries.TABS,
             Entries.SEARCH_IN_PAGE,
             Entries.GO_TO_FAVORITES,
             Entries.DESKTOP_PAIRING,
@@ -133,6 +135,7 @@ private enum Entries {
             Entries.ACTIONS,
             Entries.NEW_TAB,
             Entries.NEW_INCOGNITO_TAB,
+            Entries.TABS,
             Entries.SEARCH_IN_PAGE,
             Entries.DESKTOP_PAIRING,
             Entries.SEND_TAB_TO_DESKTOP,
@@ -327,6 +330,9 @@ private void prepareEntries() {
         if (BuildConfig.IS_LUMEN) {
             entries.remove(Entries.DESKTOP_PAIRING);
         }
+        if (BuildConfig.IS_NOT_LUMEN) {
+            entries.remove(Entries.TABS);
+        }
         if (!BuildConfig.DEBUG) {
             entries.remove(Entries.REACT_DEBUG);
         }
@@ -569,6 +575,11 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                             state.getMode() == Mode.SEARCH ? "cards" : "web");
                     bus.post(new BrowserEvents.NewTab(false));
                     break;
+                case TABS:
+                    telemetry.sendMainMenuSignal(TelemetryKeys.TAB_COUNT, isIncognitoMode(),
+                            state.getMode() == Mode.SEARCH ? "cards" : "web");
+                    bus.post(new Messages.GoToOverview());
+                    break;
                 case SEARCH_IN_PAGE:
                     telemetry.sendMainMenuSignal(TelemetryKeys.PAGE_SEARCH, isIncognitoMode(),
                             state.getMode() == Mode.SEARCH ? "cards" : "web");
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index b9f63fc5e..9a1b38d21 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -41,4 +41,5 @@
     <item name="background_manager_mode_key" type="id" />
     <item name="favorites_view_parent" type="id" />
     <item name="tabs_manager_button" type="id" />
+    <item name="tabs_menu_button" type="id" />
 </resources>

From 30b7eb0672de64b1c59ab3a791ec518a4cebc770 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Mon, 8 Jul 2019 17:31:57 +0200
Subject: [PATCH 21/57] AP-392 clicking on menu Favorites direct the user to
 the StartTab (#152)

---
 .../com/cliqz/browser/starttab/StartTabContainer.java |  4 ++++
 .../com/cliqz/browser/starttab/StartTabContainer.java |  4 ++++
 .../java/com/cliqz/browser/main/MainActivity.java     |  6 ++++--
 .../main/java/com/cliqz/browser/main/TabFragment.java | 11 +++++++++++
 .../com/cliqz/browser/main/search/SearchView.java     |  6 +++++-
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/app/src/cliqz/java/com/cliqz/browser/starttab/StartTabContainer.java b/app/src/cliqz/java/com/cliqz/browser/starttab/StartTabContainer.java
index c26c51c7c..ff50b0aa5 100644
--- a/app/src/cliqz/java/com/cliqz/browser/starttab/StartTabContainer.java
+++ b/app/src/cliqz/java/com/cliqz/browser/starttab/StartTabContainer.java
@@ -33,4 +33,8 @@ public StartTabContainer(@NonNull Context context, @Nullable AttributeSet attrs,
     public void updateFreshTab() {
         mFreshtab.updateFreshTab();
     }
+
+    public void gotToFavorites() {
+        // NO-OP, stub for supporting the Lumen Flavor
+    }
 }
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/StartTabContainer.java b/app/src/lumen/java/com/cliqz/browser/starttab/StartTabContainer.java
index f6b01068d..df179a482 100644
--- a/app/src/lumen/java/com/cliqz/browser/starttab/StartTabContainer.java
+++ b/app/src/lumen/java/com/cliqz/browser/starttab/StartTabContainer.java
@@ -55,6 +55,10 @@ public void updateFreshTab() {
         mStartTabAdapter.updateView(mViewPager.getCurrentItem());
     }
 
+    public void gotToFavorites() {
+        mViewPager.setCurrentItem(2);
+    }
+
     @Override
     public void setVisibility(int visibility) {
         super.setVisibility(visibility);
diff --git a/app/src/main/java/com/cliqz/browser/main/MainActivity.java b/app/src/main/java/com/cliqz/browser/main/MainActivity.java
index 59b1f62eb..f701f105f 100644
--- a/app/src/main/java/com/cliqz/browser/main/MainActivity.java
+++ b/app/src/main/java/com/cliqz/browser/main/MainActivity.java
@@ -599,8 +599,10 @@ public void goToOverView(Messages.GoToOverview event) {
     @SuppressWarnings("UnusedParameters")
     @Subscribe
     public void goToFavorites(Messages.GoToFavorites event) {
-        mOverViewFragment.setDisplayFavorites();
-        goToOverView(null);
+        if (BuildConfig.IS_NOT_LUMEN) {
+            mOverViewFragment.setDisplayFavorites();
+            goToOverView(null);
+        }
     }
 
     @Subscribe
diff --git a/app/src/main/java/com/cliqz/browser/main/TabFragment.java b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
index 86b82afd3..2e23fbf33 100644
--- a/app/src/main/java/com/cliqz/browser/main/TabFragment.java
+++ b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
@@ -1373,6 +1373,17 @@ void onSearchBarBackPressed(@Nullable Messages.SearchBarBackPressed msg) {
         }
     }
 
+    @Subscribe
+    void onGoToFavorites(@NonNull Messages.GoToFavorites msg) {
+        if (BuildConfig.IS_NOT_LUMEN) {
+            return;
+        }
+
+        state.setMode(Mode.SEARCH);
+        searchBar.showSearchEditText();
+        searchView.showFavorites();
+    }
+
     private void updateUI() {
         try {
             final Activity activity = FragmentUtilsV4.getActivity(this);
diff --git a/app/src/main/java/com/cliqz/browser/main/search/SearchView.java b/app/src/main/java/com/cliqz/browser/main/search/SearchView.java
index 7ee4db042..a011bbae4 100644
--- a/app/src/main/java/com/cliqz/browser/main/search/SearchView.java
+++ b/app/src/main/java/com/cliqz/browser/main/search/SearchView.java
@@ -44,7 +44,7 @@ public class SearchView extends FrameLayout {
 
     private ReactRootView mReactView;
 
-    public StartTabContainer startTabContainer;
+    private StartTabContainer startTabContainer;
 
     @Inject
     PreferenceManager preferenceManager;
@@ -205,4 +205,8 @@ public void handleUrlbarFocusChange(boolean hasFocus) {
         final String eventName = hasFocus ? ExtensionEvents.CLIQZ_EVENT_URL_BAR_FOCUS : ExtensionEvents.CLIQZ_EVENT_URL_BAR_BLUR;
         engine.publishEvent(eventName, Arguments.createMap());
     }
+
+    public void showFavorites() {
+        startTabContainer.gotToFavorites();
+    }
 }

From cb7b82a3fefdf3152f09b51ac40604b4057151ee Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Mon, 8 Jul 2019 18:16:52 +0200
Subject: [PATCH 22/57] AP-344 Lumen german strings (#154)

---
 app/src/lumen/res/values-de/strings.xml | 79 +++++++++++++++++++++++--
 1 file changed, 73 insertions(+), 6 deletions(-)

diff --git a/app/src/lumen/res/values-de/strings.xml b/app/src/lumen/res/values-de/strings.xml
index cdd9d418e..177a2315c 100644
--- a/app/src/lumen/res/values-de/strings.xml
+++ b/app/src/lumen/res/values-de/strings.xml
@@ -1,14 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="url_bar_search_hint">Lumen Suche</string>
-    <string name="shared_using">Geteilt mit Lumen für Android</string>
     <string name="optimized_block_ads_description">Der Werbeblocker von Lumen ist noch in der Entwicklung (Beta). Die Wahlmöglichkeiten der fertigen Version werden sein: Faire Werbung zulassen (Voreinstellung), jegliche Werbung blockieren, jegliche Werbung akzeptieren. Mehr https://cliqz.com/whycliqz/adblocking</string>
     <string name="antiphishing_message">Lumen hat den Zugriff auf %1$s blockiert, weil diese Seite als Phishing-Website gemeldet wurde. Phishing-Websites geben vor, vertrauenswürdig zu sein, damit du deine Anmeldedaten, dein Passwort oder andere vertrauliche Informationen preisgibst. [Mehr erfahren|Link to https://cliqz.com/whycliqz/anti-phishing]</string>
     <string name="rate_us">Lumen Browser bewerten</string>
     <string name="summary_adblock_data">Bitte beachte: Lumen Browser muss größere Informationspakete laden bevor der Werbeblocker effizient funktioniert. Dazu muss die App mit einem WLAN verbunden sein.</string>
     <string name="tips_and_tricks">Hol dir das Beste aus Lumen</string>
     <string name="msg_pairing_instructions_dialog">Öffne den Lumen Browser auf deinem Computer (oder lade ihn von cliqz.com herunter).</string>
-    <string name="app_name">Lumen Browser</string>
     <string name="pairing_information">Verbinde Lumen auf deinem mobilen Endgerät mit Lumen auf deinem Computer. Damit kannst du Tabs zwischen deinem Computer und deinem mobilen Browser schicken. Du kannst außerdem Videos direkt auf dein mobiles Gerät herunterladen.</string>
     <string name="request_location_access">Darf Lumen Browser auf deine Standortinformationen zugreifen?</string>
     <string name="msg_new_icon">Hey, das Lumen-logo ist jetzt blau. Schau doch mal in die neue Version rein!</string>
@@ -20,19 +17,89 @@
     <string name="default_browser_message">Du scheinst Lumen gerne zu verwenden. Möchtest du Lumen zu deinem Standardbrowser machen?</string>
     <string name="save_password_text">Soll Lumen dein Passwort für diese Webseite speichern?</string>
     <string name="eula_text">Lumen für Android basiert auf dem Open-Source-Projekt &lt;a href=https://github.com/anthonycr/Lightning-Browser/blob/dev/LICENSE&gt;Open-Source-Projekt Lightning Browser&lt;/a&gt; und wird unter der &lt;a href=https://www.mozilla.org/en-US/MPL/2.0/&gt;Mozilla Public License 2.0&lt;/a&gt; bereitgestellt - einer freien Softwarelizenz, die es dir erlaubt das Programm für jeden Zweck auszuführen, die Funktionsweise des Programms zu untersuchen, das Programm an Freunde weiterzugeben und das Programm nach deinen Bedürfnissen zu modifizieren. Es bestehen keine zusätzlichen Bestimmungen für diese Endnutzer-Lizenzvereinbarung.</string>
-    <string name="welcome_message">Willkommen bei Lumen!</string>
     <string name="agree_privacy_policy_message">Durch Verwendung dieser App stimmst du &lt;font color="#00aef0"&gt;der Datenschutzerklärung von Lumen zu.&lt;/font&gt;</string>
     <string name="privacy_policy_title">Datenschutzerklärung - Lumen</string>
     <string name="send_usage_data_summary">Hilf uns deine Browsernutzung zu verbessern. Lumen sammelt streng anonyme Daten darüber, wie du Lumen benutzt. Zu keinem Zeitpunkt wird eine PII erfasst.</string>
     <string name="user_sentiment_survey_first_line_msg">Hallo! Wir möchten sehr gerne etwas über Ihre Meinung zum Lumen Browser erfahren. i</string>
 
+    <string name="non_subscriber_ultimate_protection">Komplettschutz: AUS</string>
+    <string name="non_subscriber_ultimate_protection_desc">Du bist ohne Komplettschutz und Werbeblocker unterwegs.</string>
+    <string name="non_subscriber_ultimate_protection_button">Einschalten</string>
+    <string name="bond_dashboard_clear_dialog_title">Statistiken zurücksetzen?</string>
+    <string name="bond_dashboard_clear_dialog_message">Dies wird alle Daten im Dashboard löschen und kann nicht rückgängig gemacht werden.</string>
+    <string name="cancel">Abbrechen</string>
+    <string name="button_ok">Zurücksetzen</string>
+    <string name="bond_dashboard_ultimate_protection">Komplettschutz:</string>
+    <string name="bond_dashboard_contols_pause">Pause</string>
+    <string name="bond_dashboard_contols_vpn">VPN</string>
+    <string name="bond_dashboard_contols_clear">Zurücksetzen</string>
+    <string name="bond_dashboard_contols_on">AN</string>
+    <string name="bond_dashboard_contols_off">AUS</string>
+    <string name="bond_dashboard_today_title">Heute</string>
+    <string name="bond_dashboard_week_title">Letzte 7 Tage</string>
+    <string name="bond_dashboard_time_saved_title">Zeit gespart</string>
+    <string name="bond_dashboard_ads_blocked_title">Werbungen entfernt</string>
+    <string name="bond_dashboard_data_saved_title">Datenvolumen gespart</string>
+    <string name="bond_dashboard_phishing_protection_title">Webseiten überprüft</string>
+    <string name="bond_dashboard_tracking_companies_title">Datensammler abgewehrt</string>
+    <string name="bond_dashboard_units_seconds">SEK</string>
+    <string name="bond_dashboard_units_minutes">"MIN"</string>
+    <string name="bond_dashboard_units_hours">"H"</string>
+    <string name="bond_dashboard_units_days">TAGE"</string>
+    <string name="bond_dashboard_units_kb">"KB"</string>
+    <string name="bond_dashboard_units_mb">"MB"</string>
+    <string name="bond_dashboard_units_gb">"GB"</string>
+    <string name="bond_dashboard_ultimate_protection_pause_dialog_negative_button">Abbrechen</string>
+    <string name="bond_dashboard_ultimate_protection_pause_dialog_positive_button">Pause</string>
+    <string name="bond_dashboard_contols_start">Start</string>
+    <string name="bond_dashboard_protection_off">Komplettschutz aus</string>
+    <string name="reset_statistics">Statistiken zurücksetzen</string>
+
+
+    <string name="url_bar_search_hint">Suchen oder Adresse eingeben</string>
+    <string name="search_hint">Suchen oder Adresse eingeben</string>
+    <string name="app_name">Lumen Browser</string>
+    <string name="shared_using">Geteilt mit Lumen für Android</string>
+    <string name="welcome_message">Willkommen bei Lumen!</string>
+
     <!-- Start Tab -->
     <string name="start_tab_welcome_message">Willkommen bei Lumen!</string>
 
+    <string name="trial_over_upgrade_lumen_title">Deine Testversion is abgelaufen</string>
+    <string name="trial_over_upgrade_lumen_description">Du kannst Lumen weiter nutzen, aber ohne Komplettschutz und VPN. Oder hol dir Premium.</string>
+    <string name="trial_over_upgrade_lumen_dismiss">Nein, Danke</string>
+    <string name="trial_over_upgrade_lumen_proceed">Mehr Erfahren</string>
     <plurals name="trial_period_upgrade_description">
-        <item quantity="one">Noch 1 Tag in der Test-Version</item>
-        <item quantity="other">Noch %d Tage in der Test-Version</item>
+        <item quantity="one">1 weiterer Tag in der Testversion</item>
+        <item quantity="other">%d weitere Tage in der Testversion</item>
     </plurals>
     <string name="upgrade_button">Upgrade</string>
     <string name="made_in_germany">Made in Germany</string>
+
+    <!-- VPN -->
+    <string name="learn_more_btn">MEHR ERFAHREN</string>
+    <string name="unlock_vpn_dialog_title">VPN-Schutz</string>
+    <string name="unlock_vpn_dialog_description">Schalte VPN frei um das Beste aus Lumen herauszuholen.</string>
+    <string name="unlock_vpn_dialog_negative_btn">Nein, Danke</string>
+    <string name="unlock_vpn_dialog_positive_btn">@string/learn_more</string>
+    <string name="learn_more_link">Schalte VPN frei um das Beste aus Lumen herauszuholen. MEHR ERFAHREN</string>
+    <string name="vpn_feature_one">Schutz vor Hackern</string>
+    <string name="vpn_feature_two">Verschleiert Standort</string>
+    <string name="vpn_cta_disabled">@string/unlock_vpn_dialog_description</string>
+    <string name="vpn_cta_enabled">VPN steht für Virtuelles Privates Netzwerk</string>
+
+    <!-- Subscription -->
+    <string name="button_buy_subscription">Abonnieren</string>
+    <string name="button_upgrade_subscription">Upgrade</string>
+    <string name="text_subscribed">Abonniert</string>
+    <string name="subscription_product_row_highlighted">Bestes Angebot\nNur für kurze Zeit</string>
+    <string name="per_month_text">%1$s / MONAT</string>
+
+    <!-- Restore Subscription -->
+    <string name="restore_subscription">Abo wiederherstellen</string>
+    <string name="restore_subscription_dialog_title">Abo wiederherstellen?</string>
+    <string name="restore_subscription_dialog_desc">Du hast bereits ein Abo für %1$s</string>
+    <string name="restore_subscription_dialog_positive_btn">Wiederherstellen</string>
+    <string name="restore_subscription_error_msg">Kein Abo vorhanden</string>
+    <string name="restore_subscription_success">Abo wiederhergestellt</string>
 </resources>

From 6ccf1a898c129c072f98d726670673873c35f6bf Mon Sep 17 00:00:00 2001
From: ravjit-cliqz <ravjit@cliqz.com>
Date: Tue, 9 Jul 2019 15:16:03 +0200
Subject: [PATCH 23/57] AP-367 vpn connects and disconnects - added
 notification (#149)

---
 app/build.gradle                     |  5 ++++-
 app/src/lumen/AndroidManifest.xml    | 17 +++++++++++++++++
 app/src/lumen/res/values/strings.xml |  2 ++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 app/src/lumen/AndroidManifest.xml

diff --git a/app/build.gradle b/app/build.gradle
index dadce072d..5cc220660 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,6 +37,9 @@ android {
             shrinkResources false
             proguardFiles 'proguard-project.txt'
             versionNameSuffix '-debug'
+            dexcount {
+                enabled false
+            }
         }
 
         release {
@@ -221,7 +224,7 @@ dependencies {
     lumenImplementation 'com.revenuecat.purchases:purchases:2.1.2'
 
     // vpn module
-    lumenImplementation 'com.cliqz:com.cliqz.vpnlib:1.0.1'
+    lumenImplementation 'com.cliqz:com.cliqz.vpnlib:1.0.2'
 
     // Testing-only dependencies
     testImplementation 'junit:junit:4.12'
diff --git a/app/src/lumen/AndroidManifest.xml b/app/src/lumen/AndroidManifest.xml
new file mode 100644
index 000000000..2e66c3b4d
--- /dev/null
+++ b/app/src/lumen/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application tools:ignore="GoogleAppIndexingWarning">
+        <service android:name="de.blinkt.openvpn.core.OpenVPNService">
+            <meta-data
+                android:name="notification_title"
+                android:resource="@string/vpn_notification_title"/>
+            <meta-data
+                android:name="notification_content"
+                android:resource="@string/vpn_notification_content"/>
+            <meta-data
+                android:name="notification_icon"
+                android:resource="@drawable/ic_vpn_on"/>
+        </service>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/app/src/lumen/res/values/strings.xml b/app/src/lumen/res/values/strings.xml
index 836136280..3965210aa 100644
--- a/app/src/lumen/res/values/strings.xml
+++ b/app/src/lumen/res/values/strings.xml
@@ -93,6 +93,8 @@
     <string name="vpn_feature_two">Hide your location</string>
     <string name="vpn_cta_disabled">@string/unlock_vpn_dialog_description</string>
     <string name="vpn_cta_enabled">VPN is short for Virtual Private Network.</string>
+    <string name="vpn_notification_title">Lumen Browser - VPN</string>
+    <string name="vpn_notification_content">You are connected to %s</string>
 
     <!-- Subscription -->
     <string name="button_buy_subscription">Subscribe</string>

From da95f044cc9c51bc6803da5a065cfa62c3316600 Mon Sep 17 00:00:00 2001
From: ravjit-cliqz <ravjit@cliqz.com>
Date: Tue, 9 Jul 2019 17:53:55 +0200
Subject: [PATCH 24/57] Show device id in settings menu and fixed backend url
 for each flavour (#155)

---
 .../browser/purchases/trial/TrialPeriodRemoteRepo.kt     | 5 ++---
 .../cliqz/browser/settings/AboutSettingsFragment.java    | 9 ++++-----
 .../src/main/java/com/cliqz/gradle/CliqzConfigTask.kt    | 1 +
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt b/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt
index 43b91effa..b2af20ec5 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt
@@ -21,7 +21,6 @@ import java.net.URL
 
 private val TAG = TrialPeriodRemoteRepo::class.java.simpleName
 private const val CONTENT_TYPE_JSON = "application/json"
-private val LUMEN_CREDENTIAL_URL = URL("https://auth-staging.lumenbrowser.com/get_credentials")
 
 private val HEADERS = mapOf("x-api-key" to CliqzConfig.VPN_API_KEY)
 
@@ -56,8 +55,8 @@ class TrialPeriodRemoteRepo(private val context: Context) {
             }
 
             override fun doInBackground(vararg params: Void): ServerData {
-                val responseJSON =
-                        HttpHandler.sendRequest("POST", LUMEN_CREDENTIAL_URL, CONTENT_TYPE_JSON, HEADERS, requestBody)
+                val responseJSON = HttpHandler.sendRequest("POST", URL(CliqzConfig.CREDENTIAL_URL),
+                        CONTENT_TYPE_JSON, HEADERS, requestBody)
                 var trialDaysLeft = 0
                 var userName = ""
                 var password = ""
diff --git a/app/src/main/java/com/cliqz/browser/settings/AboutSettingsFragment.java b/app/src/main/java/com/cliqz/browser/settings/AboutSettingsFragment.java
index 12611ca49..a8c2463ac 100644
--- a/app/src/main/java/com/cliqz/browser/settings/AboutSettingsFragment.java
+++ b/app/src/main/java/com/cliqz/browser/settings/AboutSettingsFragment.java
@@ -3,10 +3,9 @@
  */
 package com.cliqz.browser.settings;
 
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.preference.Preference;
+import android.provider.Settings;
 import android.widget.Toast;
 
 import com.cliqz.browser.BuildConfig;
@@ -63,9 +62,9 @@ private String getVersion() {
                     mAppVerCounter++;
                     return false;
                 } else {
-                    final Intent intent = new Intent(Intent.ACTION_VIEW,
-                            Uri.parse("http://i.imgur.com/4lpVkTS.gif"));
-                    getActivity().startActivity(intent);
+                    Toast.makeText(getActivity(),
+                            Settings.Secure.getString(getActivity().getContentResolver(), Settings.Secure.ANDROID_ID),
+                            Toast.LENGTH_LONG).show();
                     mAppVerCounter = 0;
                     return true;
                 }
diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
index b1c961289..5659d778a 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
@@ -105,6 +105,7 @@ class Config {
     var vpnApiKey = ""
     var revenuecatApiKey = ""
     var sentryToken = ""
+    var credentialUrl = ""
 
     @Suppress("UNCHECKED_CAST")
     fun merge(other: Config, logger: Logger? = null): Config {

From 292a239055a90376423125917467b4f92996cdfe Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Tue, 9 Jul 2019 18:14:55 +0200
Subject: [PATCH 25/57] Updated cliqz configuration file reference

---
 Jenkinsfile.upload | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile.upload b/Jenkinsfile.upload
index 9c6cb5a45..c4e0b4003 100644
--- a/Jenkinsfile.upload
+++ b/Jenkinsfile.upload
@@ -31,7 +31,7 @@ node('master'){
                         file(credentialsId: '263e59fb-e9de-4e51-962c-0237c6ee167b', variable: 'CERT_PATH'),
                         string(credentialsId: '60354bba-8ed0-4df9-8f8e-5be7454c1680', variable: 'CERT_PASS'),
                         file(credentialsId: '2939d2e1-dd9a-4097-adc2-430e3d67157a', variable: 'PLAY_STORE_CERT'),
-                        file(credentialsId: '3796eb16-42cd-4551-a5a5-c4fe3a18719a', variable: 'CLIQZ_CONFIG_JSON'),
+                        file(credentialsId: 'cliqz-config.json', variable: 'CLIQZ_CONFIG_JSON'),
                         file(credentialsId: '6006a534-9f2e-4ba8-93f9-f0f27c0713df', variable: 'GOOGLE_SERVICES')]) {
                     stage('Compile and Upload') {
                             sh '''#!/bin/bash -l
@@ -74,4 +74,4 @@ node('master'){
             }
         }
     }
-}
\ No newline at end of file
+}

From b478ccd7788ee5d8c95aff6ae1c832f46534776d Mon Sep 17 00:00:00 2001
From: ravjit-cliqz <ravjit@cliqz.com>
Date: Tue, 9 Jul 2019 19:03:06 +0200
Subject: [PATCH 26/57] AP-305 AP-339 Dashboard and Vpn panel buttons ux fixes
 (#139)

---
 .../controlcenter/ControlCenterHelper.java    |  7 ++++--
 .../java/com/cliqz/browser/vpn/VpnPanel.java  |  9 +++++++
 .../controlcenter/ControlCenterDialog.java    |  9 +++++++
 .../controlcenter/ControlCenterHelper.kt      | 24 ++++++++++++++++++-
 .../main/FlavoredActivityComponent.java       |  1 +
 .../java/com/cliqz/browser/vpn/VpnPanel.java  | 15 +++++++++---
 .../com/cliqz/browser/app/AppComponent.java   |  3 ---
 .../browser/main/MainActivityComponent.java   |  3 +++
 .../java/com/cliqz/browser/main/Messages.java |  3 +++
 .../com/cliqz/browser/main/TabFragment.java   | 20 +++++++++++++---
 .../com/cliqz/browser/widget/SearchBar.java   |  2 ++
 11 files changed, 84 insertions(+), 12 deletions(-)

diff --git a/app/src/cliqz/java/com/cliqz/browser/controlcenter/ControlCenterHelper.java b/app/src/cliqz/java/com/cliqz/browser/controlcenter/ControlCenterHelper.java
index 5e763add6..70bd8e3ca 100644
--- a/app/src/cliqz/java/com/cliqz/browser/controlcenter/ControlCenterHelper.java
+++ b/app/src/cliqz/java/com/cliqz/browser/controlcenter/ControlCenterHelper.java
@@ -1,5 +1,6 @@
 package com.cliqz.browser.controlcenter;
 
+import android.content.Context;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -7,6 +8,7 @@
 
 import com.cliqz.browser.app.AppComponent;
 import com.cliqz.browser.app.BrowserApp;
+import com.cliqz.browser.main.FlavoredActivityComponent;
 import com.cliqz.browser.main.Messages;
 import com.cliqz.browser.telemetry.Telemetry;
 import com.cliqz.nove.Bus;
@@ -35,9 +37,10 @@ public class ControlCenterHelper implements ControlCenterActions {
     @Inject
     Telemetry telemetry;
 
-    public ControlCenterHelper(@NonNull FragmentManager fragmentManager) {
-        final AppComponent component = BrowserApp.getAppComponent();
+    public ControlCenterHelper(Context context, @NonNull FragmentManager fragmentManager) {
         this.mFragmentManager = fragmentManager;
+        final FlavoredActivityComponent component = context != null ?
+                BrowserApp.getActivityComponent(context) : null;
         if (component != null) {
             component.inject(this);
         }
diff --git a/app/src/cliqz/java/com/cliqz/browser/vpn/VpnPanel.java b/app/src/cliqz/java/com/cliqz/browser/vpn/VpnPanel.java
index 9ca3c73b4..8085cf6df 100644
--- a/app/src/cliqz/java/com/cliqz/browser/vpn/VpnPanel.java
+++ b/app/src/cliqz/java/com/cliqz/browser/vpn/VpnPanel.java
@@ -1,5 +1,6 @@
 package com.cliqz.browser.vpn;
 
+import android.app.Dialog;
 import android.view.View;
 
 import androidx.fragment.app.FragmentManager;
@@ -19,4 +20,12 @@ public static VpnPanel create(View view) {
 
     public void show(FragmentManager fragmentManager, String tag) {
     }
+
+    public boolean isVisible() {
+        return false;
+    }
+
+    public Dialog getDialog() {
+        return null;
+    }
 }
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
index 830434739..29d75b80f 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
@@ -10,6 +10,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
+import android.view.WindowManager;
 import android.widget.Button;
 
 import androidx.annotation.NonNull;
@@ -167,6 +168,14 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         return view;
     }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        final Window window = getDialog().getWindow();
+        window.addFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
+        getDialog().setCanceledOnTouchOutside(false);
+    }
+
     @Subscribe
     void clearDashboardData(Messages.ClearDashboardData clearDashboardData) {
         insights.clearData();
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterHelper.kt b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterHelper.kt
index 292039298..fd65e4a9e 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterHelper.kt
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterHelper.kt
@@ -1,15 +1,30 @@
 package com.cliqz.browser.controlcenter
 
 import acr.browser.lightning.constant.Constants
+import android.content.Context
 import android.view.View
 import androidx.fragment.app.FragmentManager
+import com.cliqz.browser.app.BrowserApp
+import com.cliqz.browser.main.MainActivityHandler
 import com.cliqz.browser.main.Messages
+import com.cliqz.nove.Bus
 import com.cliqz.nove.Subscribe
+import javax.inject.Inject
 
 /**
  * Copyright © Cliqz 2019
  */
-class ControlCenterHelper(private val fragmentManager: FragmentManager) : ControlCenterActions {
+class ControlCenterHelper(context : Context, private val fragmentManager: FragmentManager) : ControlCenterActions {
+
+    @Inject
+    lateinit var handler: MainActivityHandler
+
+    @Inject
+    lateinit var bus : Bus
+
+    init {
+        BrowserApp.getActivityComponent(context)?.inject(this)
+    }
 
     private var mSource: View? = null
 
@@ -20,8 +35,15 @@ class ControlCenterHelper(private val fragmentManager: FragmentManager) : Contro
     }
 
     override fun toggleControlCenter() {
+        if (controlCenterDialog != null && controlCenterDialog!!.isVisible) {
+            controlCenterDialog?.dialog?.dismiss()
+            return
+        }
         controlCenterDialog = ControlCenterDialog.create(mSource)
         controlCenterDialog?.show(fragmentManager, Constants.CONTROL_CENTER)
+        handler.postDelayed({
+            bus.post(Messages.DismissVpnPanel())
+        }, 500)
     }
 
     override fun setControlCenterData(source: View, isIncognito: Boolean, hashCode: Int, url: String) {
diff --git a/app/src/lumen/java/com/cliqz/browser/main/FlavoredActivityComponent.java b/app/src/lumen/java/com/cliqz/browser/main/FlavoredActivityComponent.java
index 9ab600fc3..e2861d663 100644
--- a/app/src/lumen/java/com/cliqz/browser/main/FlavoredActivityComponent.java
+++ b/app/src/lumen/java/com/cliqz/browser/main/FlavoredActivityComponent.java
@@ -2,6 +2,7 @@
 
 import com.cliqz.browser.annotations.PerActivity;
 import com.cliqz.browser.controlcenter.ControlCenterDialog;
+import com.cliqz.browser.controlcenter.ControlCenterHelper;
 import com.cliqz.browser.controlcenter.DashboardFragment;
 import com.cliqz.browser.purchases.PurchaseFragment;
 import com.cliqz.browser.purchases.PurchasesManager;
diff --git a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
index 2d92b9c8c..3776b0b8a 100644
--- a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
+++ b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
@@ -14,6 +14,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
+import android.view.WindowManager;
 import android.view.animation.LinearInterpolator;
 import android.widget.Chronometer;
 import android.widget.ImageView;
@@ -26,10 +27,10 @@
 
 import com.cliqz.browser.R;
 import com.cliqz.browser.app.BrowserApp;
+import com.cliqz.browser.extensions.DrawableExtensionsKt;
 import com.cliqz.browser.main.FlavoredActivityComponent;
 import com.cliqz.browser.main.Messages;
 import com.cliqz.browser.purchases.PurchasesManager;
-import com.cliqz.browser.extensions.DrawableExtensionsKt;
 import com.cliqz.browser.webview.CliqzMessages;
 import com.cliqz.nove.Bus;
 import com.cliqz.nove.Subscribe;
@@ -40,12 +41,11 @@
 import javax.inject.Inject;
 
 import acr.browser.lightning.preference.PreferenceManager;
-import de.blinkt.openvpn.VpnProfile;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import de.blinkt.openvpn.VpnProfile;
 import de.blinkt.openvpn.core.ConnectionStatus;
-import de.blinkt.openvpn.core.LogItem;
 import de.blinkt.openvpn.core.ProfileManager;
 import de.blinkt.openvpn.core.VpnStatus;
 
@@ -181,6 +181,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
                 getString(R.string.vpn_cta_enabled) : getString(R.string.vpn_cta_disabled));
 
         mMainHandler = new Handler(getContext().getMainLooper());
+        final Window window = getDialog().getWindow();
+        window.addFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
+        getDialog().setCanceledOnTouchOutside(false);
     }
 
     @Nullable
@@ -190,6 +193,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         return inflater.inflate(R.layout.home_vpn_panel, container, false);
     }
 
+
     @OnClick(R.id.vpn_country)
     void vpnCountryClicked() {
         if (selectedProfile != null) {
@@ -352,4 +356,9 @@ private void vpnMsgsChangeDrawable(@DrawableRes int id) {
         DrawableExtensionsKt.drawableStart(mVpnMsgLineOne, id);
         DrawableExtensionsKt.drawableStart(mVpnMsgLineTwo, id);
     }
+
+    @Subscribe
+    void dismissVpnPanel(Messages.DismissVpnPanel event) {
+        dismissAllowingStateLoss();
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cliqz/browser/app/AppComponent.java b/app/src/main/java/com/cliqz/browser/app/AppComponent.java
index 51c5fec6a..6e0bd176a 100644
--- a/app/src/main/java/com/cliqz/browser/app/AppComponent.java
+++ b/app/src/main/java/com/cliqz/browser/app/AppComponent.java
@@ -4,7 +4,6 @@
 import com.cliqz.browser.connect.PairedDevicesFragment;
 import com.cliqz.browser.connect.SyncActivity;
 import com.cliqz.browser.controlcenter.ControlCenterComponent;
-import com.cliqz.browser.controlcenter.ControlCenterHelper;
 import com.cliqz.browser.controlcenter.ControlCenterModule;
 import com.cliqz.browser.gcm.MessageListenerService;
 import com.cliqz.browser.gcm.NotificationDismissedReceiver;
@@ -134,7 +133,5 @@ public interface AppComponent {
 
     void inject(SearchEnginesModule searchEnginesModule);
 
-    void inject(ControlCenterHelper controlCenterHelper);
-
     void inject(BrowserApp browserApp);
 }
diff --git a/app/src/main/java/com/cliqz/browser/main/MainActivityComponent.java b/app/src/main/java/com/cliqz/browser/main/MainActivityComponent.java
index 4810e3185..73b4aa156 100644
--- a/app/src/main/java/com/cliqz/browser/main/MainActivityComponent.java
+++ b/app/src/main/java/com/cliqz/browser/main/MainActivityComponent.java
@@ -1,5 +1,6 @@
 package com.cliqz.browser.main;
 
+import com.cliqz.browser.controlcenter.ControlCenterHelper;
 import com.cliqz.browser.main.search.Incognito;
 import com.cliqz.browser.main.search.SearchView;
 import com.cliqz.browser.overview.CommonOverviewFragment;
@@ -46,4 +47,6 @@ interface MainActivityComponent {
     void inject(PasswordManager passwordManager);
 
     void inject(Incognito incognito);
+
+    void inject(ControlCenterHelper controlCenterHelper);
 }
diff --git a/app/src/main/java/com/cliqz/browser/main/Messages.java b/app/src/main/java/com/cliqz/browser/main/Messages.java
index f8b1c7aa1..5bebb4d54 100644
--- a/app/src/main/java/com/cliqz/browser/main/Messages.java
+++ b/app/src/main/java/com/cliqz/browser/main/Messages.java
@@ -195,6 +195,9 @@ public static class UpdateAdBlockingList {
     public static class DismissControlCenter {
     }
 
+    public static class DismissVpnPanel {
+    }
+
     public static class UpdateControlCenterIcon {
         @NonNull public final ControlCenterStatus status;
 
diff --git a/app/src/main/java/com/cliqz/browser/main/TabFragment.java b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
index 2e23fbf33..1df8d7db7 100644
--- a/app/src/main/java/com/cliqz/browser/main/TabFragment.java
+++ b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
@@ -143,6 +143,8 @@ public class TabFragment extends BaseFragment implements LightningView.LightingV
     private boolean mRequestDesktopSite = false;
     private boolean mIsReaderModeOn = false;
 
+    private VpnPanel mVpnPanel;
+
     @BindView(R.id.local_container)
     FrameLayout localContainer;
 
@@ -226,6 +228,9 @@ public class TabFragment extends BaseFragment implements LightningView.LightingV
     @Inject
     VpnHandler vpnHandler;
 
+    @Inject
+    MainActivityHandler mainActivityHandler;
+
     private String mDomainName = "";
 
     @NonNull
@@ -326,7 +331,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         }
 
         mControlCenterHelper =
-                new ControlCenterHelper(getChildFragmentManager());
+                new ControlCenterHelper(getContext(), getChildFragmentManager());
 
         if (openTabsCounter != null) {
             openTabsCounter.setCounter(tabsManager.getTabCount());
@@ -550,6 +555,8 @@ void menuClicked() {
             mOverFlowMenu.setDesktopSiteEnabled(mRequestDesktopSite);
             mOverFlowMenu.show();
             hideKeyboard(null);
+            bus.post(new Messages.DismissControlCenter());
+            bus.post(new Messages.DismissVpnPanel());
         }
     }
 
@@ -627,8 +634,15 @@ void toggleReaderMode() {
     @Optional
     @OnClick(R.id.vpn_panel_button)
     void toggleVpnView() {
-        final VpnPanel vpnPanel = VpnPanel.create(mStatusBar);
-        vpnPanel.show(getChildFragmentManager(), Constants.VPN_PANEL);
+        if (mVpnPanel != null && mVpnPanel.isVisible()) {
+            mVpnPanel.getDialog().dismiss();
+            return;
+        }
+        mVpnPanel = VpnPanel.create(mStatusBar);
+        mVpnPanel.show(getChildFragmentManager(), Constants.VPN_PANEL);
+        mainActivityHandler.postDelayed(() -> {
+            bus.post(new Messages.DismissControlCenter());
+        }, 500);
     }
 
     @SuppressWarnings("UnusedParameters")
diff --git a/app/src/main/java/com/cliqz/browser/widget/SearchBar.java b/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
index c6b02fd86..d3c5a5531 100644
--- a/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
+++ b/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
@@ -426,6 +426,8 @@ public void onFocusChange(View v, boolean hasFocus) {
 
             if (hasFocus) {
                 post(SearchBar.this::showKeyBoard);
+                bus.post(new Messages.DismissVpnPanel());
+                bus.post(new Messages.DismissControlCenter());
             }
 //            } else {
 //                showTitleBar();

From 147283b666163bdd3a70c53f3c93bc76f564d8e7 Mon Sep 17 00:00:00 2001
From: ravjit-cliqz <ravjit@cliqz.com>
Date: Thu, 11 Jul 2019 17:20:23 +0200
Subject: [PATCH 27/57] AP-423 added notification action AP-415 crash fix
 (#158)

---
 app/build.gradle                                     |  2 +-
 .../cliqz/java/com/cliqz/browser/vpn/VpnPanel.java   |  1 +
 app/src/lumen/AndroidManifest.xml                    |  9 ++++++---
 .../cliqz/browser/controlcenter/DashboardFragment.kt |  3 +--
 .../lumen/java/com/cliqz/browser/vpn/VpnPanel.java   |  3 ++-
 .../java/com/cliqz/browser/main/MainActivity.java    | 12 +++++++++++-
 .../java/com/cliqz/browser/main/TabFragment.java     | 12 +++++++++++-
 .../java/com/cliqz/browser/main/TabsManager.java     | 10 +++++++++-
 8 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5cc220660..c90db4b42 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -224,7 +224,7 @@ dependencies {
     lumenImplementation 'com.revenuecat.purchases:purchases:2.1.2'
 
     // vpn module
-    lumenImplementation 'com.cliqz:com.cliqz.vpnlib:1.0.2'
+    lumenImplementation 'com.cliqz:com.cliqz.vpnlib:1.0.3'
 
     // Testing-only dependencies
     testImplementation 'junit:junit:4.12'
diff --git a/app/src/cliqz/java/com/cliqz/browser/vpn/VpnPanel.java b/app/src/cliqz/java/com/cliqz/browser/vpn/VpnPanel.java
index 8085cf6df..eeebc73d7 100644
--- a/app/src/cliqz/java/com/cliqz/browser/vpn/VpnPanel.java
+++ b/app/src/cliqz/java/com/cliqz/browser/vpn/VpnPanel.java
@@ -13,6 +13,7 @@
 public class VpnPanel {
 
     public static final int VPN_LAUNCH_REQUEST_CODE = 70;
+    public static final String ACTION_DISCONNECT_VPN = null;
 
     public static VpnPanel create(View view) {
         return null;
diff --git a/app/src/lumen/AndroidManifest.xml b/app/src/lumen/AndroidManifest.xml
index 2e66c3b4d..ee8f47e45 100644
--- a/app/src/lumen/AndroidManifest.xml
+++ b/app/src/lumen/AndroidManifest.xml
@@ -5,13 +5,16 @@
         <service android:name="de.blinkt.openvpn.core.OpenVPNService">
             <meta-data
                 android:name="notification_title"
-                android:resource="@string/vpn_notification_title"/>
+                android:resource="@string/vpn_notification_title" />
             <meta-data
                 android:name="notification_content"
-                android:resource="@string/vpn_notification_content"/>
+                android:resource="@string/vpn_notification_content" />
             <meta-data
                 android:name="notification_icon"
-                android:resource="@drawable/ic_vpn_on"/>
+                android:resource="@android:drawable/ic_secure" />
+            <meta-data
+                android:name="app_package_name"
+                android:value="@string/application_id" />
         </service>
     </application>
 </manifest>
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt b/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt
index 3d3292367..af2c09416 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt
@@ -10,7 +10,6 @@ import androidx.fragment.app.Fragment
 import com.cliqz.browser.R
 import com.cliqz.browser.app.BrowserApp
 import com.cliqz.browser.extensions.color
-import com.cliqz.browser.extensions.setDrawable
 import com.cliqz.browser.extensions.tintVectorDrawable
 import com.cliqz.browser.main.Messages
 import com.cliqz.browser.purchases.PurchasesManager
@@ -109,7 +108,7 @@ class DashboardFragment : Fragment() {
         data_saved.text = dataSaved.value
         phishing_checked.text = pagesVisited.value
 
-        data_saved_icon.setDrawable(when (dataSaved.unit) {
+        data_saved_icon.setImageResource(when (dataSaved.unit) {
             R.string.bond_dashboard_units_kb -> R.drawable.ic_kb_data_saved_on
             R.string.bond_dashboard_units_mb -> R.drawable.ic_mb_data_saved_on
             R.string.bond_dashboard_units_gb -> R.drawable.ic_gb_data_saved_on
diff --git a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
index 3776b0b8a..fdfa5b29c 100644
--- a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
+++ b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
@@ -46,6 +46,7 @@
 import butterknife.OnClick;
 import de.blinkt.openvpn.VpnProfile;
 import de.blinkt.openvpn.core.ConnectionStatus;
+import de.blinkt.openvpn.core.OpenVPNService;
 import de.blinkt.openvpn.core.ProfileManager;
 import de.blinkt.openvpn.core.VpnStatus;
 
@@ -57,7 +58,7 @@ public class VpnPanel extends DialogFragment implements VpnStatus.StateListener
     private static String TAG = VpnPanel.class.getSimpleName();
 
     private static final String KEY_ANCHOR_HEIGHT = TAG + ".ANCHOR_HEIGHT";
-
+    public static final String ACTION_DISCONNECT_VPN = OpenVPNService.DISCONNECT_VPN;
     public static final int VPN_LAUNCH_REQUEST_CODE = 70;
 
     private int mAnchorHeight;
diff --git a/app/src/main/java/com/cliqz/browser/main/MainActivity.java b/app/src/main/java/com/cliqz/browser/main/MainActivity.java
index f701f105f..9cb373525 100644
--- a/app/src/main/java/com/cliqz/browser/main/MainActivity.java
+++ b/app/src/main/java/com/cliqz/browser/main/MainActivity.java
@@ -157,7 +157,6 @@ public class MainActivity extends AppCompatActivity implements ActivityComponent
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         // Task description
         ActivityUtils.setTaskDescription(this, R.string.app_name, R.color.primary_color_dark,
                 R.mipmap.ic_launcher);
@@ -292,6 +291,14 @@ protected void onCreate(Bundle savedInstanceState) {
             }
             telemetry.sendStartingSignals("cards", "cold");
         }
+        final String action = getIntent().getAction();
+        if (action != null && action.equals(VpnPanel.ACTION_DISCONNECT_VPN)) {
+            showVpnPanel();
+        }
+    }
+
+    private void showVpnPanel() {
+        tabsManager.buildTab().setOpenVpnPanel().show();
     }
 
     // Workaround for a bug in Android 9 (Pie) as reported here
@@ -413,6 +420,9 @@ protected void onNewIntent(Intent intent) {
         if (builder != null) {
             builder.show();
         }
+        if (action != null && action.equals(VpnPanel.ACTION_DISCONNECT_VPN)) {
+            showVpnPanel();
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/cliqz/browser/main/TabFragment.java b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
index 1df8d7db7..ce452be74 100644
--- a/app/src/main/java/com/cliqz/browser/main/TabFragment.java
+++ b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
@@ -115,6 +115,7 @@ public class TabFragment extends BaseFragment implements LightningView.LightingV
     public static final String KEY_TAB_ID = "tab_id";
     public static final String KEY_TITLE = "tab_title";
     public static final String KEY_FORCE_RESTORE = "tab_force_restore";
+    public static final String KEY_OPEN_VPN_PANEL = "open_vpn_panel";
 
     private OverFlowMenu mOverFlowMenu = null;
     protected boolean mIsIncognito = false;
@@ -124,6 +125,7 @@ public class TabFragment extends BaseFragment implements LightningView.LightingV
     private CliqzMessages.OpenLink mOverviewEvent = null;
     // indicate that we should not load the mInitialUrl because we are restoring a persisted tab
     private boolean mShouldRestore = false;
+    private boolean mShouldShowVpnPanel = false;
     private String mSearchEngine;
     private Message newTabMessage = null;
     private String mExternalQuery = null;
@@ -287,12 +289,14 @@ private void parseArguments(Bundle arguments) {
         if (mInitialTitle != null) {
             state.setTitle(mInitialTitle);
         }
+        mShouldShowVpnPanel = arguments.getBoolean(KEY_OPEN_VPN_PANEL);
         // We need to remove the key, otherwise the url/query/msg gets reloaded for each resume
         arguments.remove(KEY_URL);
         arguments.remove(KEY_NEW_TAB_MESSAGE);
         arguments.remove(KEY_QUERY);
         arguments.remove(KEY_TAB_ID);
         arguments.remove(KEY_FORCE_RESTORE);
+        arguments.remove(KEY_OPEN_VPN_PANEL);
     }
 
     // Use this to get which view is visible between home, cards or web
@@ -412,7 +416,7 @@ public void onStart() {
             mDelayedUrl = null;
         }
     }
-
+    
     @Override
     public void onResume() {
         super.onResume();
@@ -500,6 +504,12 @@ public void onResume() {
         readerModeButton.setImageResource(R.drawable.ic_reader_mode_off);
         updateCCIcon(progressBar.getProgress() == 100);
         updateVpnIcon();
+        if (mShouldShowVpnPanel) {
+            getView().post(() -> {
+                toggleVpnView();
+                mShouldShowVpnPanel = false;
+            });
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/cliqz/browser/main/TabsManager.java b/app/src/main/java/com/cliqz/browser/main/TabsManager.java
index 14d9d98fb..57be73698 100644
--- a/app/src/main/java/com/cliqz/browser/main/TabsManager.java
+++ b/app/src/main/java/com/cliqz/browser/main/TabsManager.java
@@ -3,10 +3,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Message;
+import android.webkit.WebView;
+
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
-import android.webkit.WebView;
 
 import com.cliqz.browser.R;
 import com.cliqz.browser.app.BrowserApp;
@@ -41,6 +42,7 @@ public class Builder {
         private String mId = null;
         private String mTitle = "";
         private boolean mRestore = false;
+        private boolean mOpenVpnPanel = false;
 
         private Builder() {}
 
@@ -84,6 +86,11 @@ public Builder setRestore(@SuppressWarnings("SameParameterValue") boolean restor
             return this;
         }
 
+        public Builder setOpenVpnPanel() {
+            this.mOpenVpnPanel = true;
+            return this;
+        }
+
         public int create() {
             if (mWasCreated) {
                 throw new RuntimeException("Can't use the same builder twice");
@@ -93,6 +100,7 @@ public int create() {
             final TabFragment newTab = new TabFragment();
             final Bundle arguments = new Bundle();
             arguments.putBoolean(MainActivity.EXTRA_IS_PRIVATE, mForgetMode);
+            arguments.putBoolean(TabFragment.KEY_OPEN_VPN_PANEL, mOpenVpnPanel);
             if (mUrl != null) {
                 arguments.putString(TabFragment.KEY_URL, mUrl);
             }

From d32a93dcb7d5c23dc6ed669bdd2afacef795e1e7 Mon Sep 17 00:00:00 2001
From: ravjit-cliqz <ravjit@cliqz.com>
Date: Thu, 11 Jul 2019 17:48:13 +0200
Subject: [PATCH 28/57] AP-376 Fix dashboard icon check symbol blinking (#153)

---
 app/src/main/java/com/cliqz/browser/main/TabFragment.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/com/cliqz/browser/main/TabFragment.java b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
index ce452be74..428fefdaa 100644
--- a/app/src/main/java/com/cliqz/browser/main/TabFragment.java
+++ b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
@@ -393,6 +393,10 @@ private void updateVpnIcon() {
 
     private void updateCCIcon(boolean isLoadingFinished) {
         if (BuildConfig.IS_LUMEN) {
+            final String url = mLightningView.getWebView().getUrl();
+            if (url != null && url.contains(TrampolineConstants.TRAMPOLINE_COMMAND_PARAM_NAME)) {
+                return; //We don't update dashboard icon states for trampoline redirects
+            }
             if (purchasesManager.isDashboardEnabled() && preferenceManager.getAdBlockEnabled()
                     && preferenceManager.isAttrackEnabled()) {
                 ccIcon.setImageResource(getFlavorDrawable(isLoadingFinished

From 424455a7695767217ce188dce2efa6d93247f48f Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Thu, 11 Jul 2019 17:49:59 +0200
Subject: [PATCH 29/57] AP-355 tab overview re-design (#157)

* AP-355 tab overview re-design

* Custom Widgets

* Vertical layouts

* Landscape

* Replacing "NotNull" annotation with "NonNull"
---
 .../res/drawable/deckview_tab_background.xml  |   6 +
 .../res/drawable/logo_start_tab.xml}          |   0
 .../res/layout-land/deckview_tab_layout.xml   |  82 ++++++++++++++
 .../cliqz/res/layout/deckview_tab_layout.xml  |  84 ++++++++++++++
 app/src/cliqz/res/values/colors.xml           |   3 +
 ..._logo_start_tab.xml => logo_start_tab.xml} |   0
 .../tabs_overview_header_gradient.xml         |  23 ++++
 .../res/layout-land/deckview_tab_layout.xml   |  70 ++++++++++++
 .../lumen/res/layout/deckview_tab_layout.xml  |  68 +++++++++++
 .../layout/fragment_freshtab_welcome_msg.xml  |   2 +-
 app/src/lumen/res/values/colors.xml           |   3 +
 app/src/lumen/res/values/dimens.xml           |   1 +
 .../com/cliqz/deckview/DeckLayoutManager.java |  10 +-
 .../cliqz/deckview/TabsDeckViewAdapter.java   |  61 ++++++----
 .../java/com/cliqz/deckview/ViewHolder.java   |   8 +-
 .../com/cliqz/widget/CliqzFrameLayout.java    |  56 +++++++++
 .../java/com/cliqz/widget/CliqzTextView.java  |  56 +++++++++
 .../res/layout-land/deckview_tab_layout.xml   | 106 ------------------
 .../main/res/layout/deckview_tab_layout.xml   |  99 ----------------
 app/src/main/res/layout/tabs_overview.xml     |  11 +-
 app/src/main/res/values/attrs.xml             |   4 +
 21 files changed, 511 insertions(+), 242 deletions(-)
 create mode 100644 app/src/cliqz/res/drawable/deckview_tab_background.xml
 rename app/src/{main/res/drawable/ic_cliqz_tab.xml => cliqz/res/drawable/logo_start_tab.xml} (100%)
 create mode 100644 app/src/cliqz/res/layout-land/deckview_tab_layout.xml
 create mode 100644 app/src/cliqz/res/layout/deckview_tab_layout.xml
 rename app/src/lumen/res/drawable/{lumen_logo_start_tab.xml => logo_start_tab.xml} (100%)
 create mode 100644 app/src/lumen/res/drawable/tabs_overview_header_gradient.xml
 create mode 100644 app/src/lumen/res/layout-land/deckview_tab_layout.xml
 create mode 100644 app/src/lumen/res/layout/deckview_tab_layout.xml
 create mode 100644 app/src/main/java/com/cliqz/widget/CliqzFrameLayout.java
 create mode 100644 app/src/main/java/com/cliqz/widget/CliqzTextView.java
 delete mode 100644 app/src/main/res/layout-land/deckview_tab_layout.xml
 delete mode 100644 app/src/main/res/layout/deckview_tab_layout.xml

diff --git a/app/src/cliqz/res/drawable/deckview_tab_background.xml b/app/src/cliqz/res/drawable/deckview_tab_background.xml
new file mode 100644
index 000000000..ecd85d85a
--- /dev/null
+++ b/app/src/cliqz/res/drawable/deckview_tab_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item app:state_incognito="true" android:drawable="@drawable/tab_background_dark" />
+    <item android:drawable="@drawable/tab_background" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_cliqz_tab.xml b/app/src/cliqz/res/drawable/logo_start_tab.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cliqz_tab.xml
rename to app/src/cliqz/res/drawable/logo_start_tab.xml
diff --git a/app/src/cliqz/res/layout-land/deckview_tab_layout.xml b/app/src/cliqz/res/layout-land/deckview_tab_layout.xml
new file mode 100644
index 000000000..c3bcab45e
--- /dev/null
+++ b/app/src/cliqz/res/layout-land/deckview_tab_layout.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.cliqz.widget.CliqzFrameLayout
+    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/tabCl"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/deckview_tab_background">
+
+    <ImageButton
+        android:id="@+id/closeBtn"
+        style="@style/Widget.AppCompat.ImageButton"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:background="@null"
+        app:srcCompat="@drawable/ic_clear_black"
+        tools:ignore="ContentDescription" />
+
+    <ImageView
+        android:id="@+id/favIconImg"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginStart="46dp"
+        app:srcCompat="@android:drawable/ic_media_play"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="0dp"
+        tools:ignore="ContentDescription" />
+
+    <com.cliqz.widget.CliqzTextView
+        android:id="@+id/titleTv"
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="84dp"
+        android:layout_marginTop="8dp"
+        android:gravity="center_vertical"
+        android:ellipsize="end"
+        android:lines="1"
+        android:singleLine="true"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        tools:text="A possibly very very very long title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_marginBottom="8dp"
+        android:layout_marginTop="46dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp">
+        <TextView
+            android:id="@+id/urlTv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:singleLine="true"
+            android:textColor="@color/primary_color"
+            tools:text="http://it.m.subdomain.example.com/folder/folder/search.php?q=long%20long%20query" />
+
+        <FrameLayout
+            android:id="@+id/backgroundFl"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="16dp"
+            tools:background="#00F">
+
+            <com.facebook.drawee.view.SimpleDraweeView
+                android:id="@+id/bigIconImg"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_gravity="center"
+                app:actualImageScaleType="fitCenter"
+                app:placeholderImage="@mipmap/ic_launcher" />
+        </FrameLayout>
+    </LinearLayout>
+
+</com.cliqz.widget.CliqzFrameLayout>
\ No newline at end of file
diff --git a/app/src/cliqz/res/layout/deckview_tab_layout.xml b/app/src/cliqz/res/layout/deckview_tab_layout.xml
new file mode 100644
index 000000000..fc386342d
--- /dev/null
+++ b/app/src/cliqz/res/layout/deckview_tab_layout.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.cliqz.widget.CliqzFrameLayout 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/tabCl"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/deckview_tab_background">
+
+    <ImageView
+        android:id="@+id/favIconImg"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginStart="8dp"
+        app:srcCompat="@android:drawable/ic_media_play"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="8dp" />
+
+    <ImageButton
+        android:id="@+id/closeBtn"
+        style="@style/Widget.AppCompat.ImageButton"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginRight="8dp"
+        android:background="@null"
+        android:layout_marginTop="8dp"
+        android:layout_gravity="right"
+        app:srcCompat="@drawable/ic_clear_black" />
+
+    <com.cliqz.widget.CliqzTextView
+        android:id="@+id/titleTv"
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:gravity="center_vertical"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="52dp"
+        android:layout_marginStart="52dp"
+        android:layout_marginTop="8dp"
+        android:ellipsize="end"
+        android:lines="1"
+        android:singleLine="true"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        tools:text="A possibly very very very long title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_marginTop="44dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp">
+
+        <TextView
+            android:id="@+id/urlTv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:singleLine="true"
+            android:textColor="@color/primary_color"
+            tools:text="http://it.m.subdomain.example.com/folder/folder/search.php?q=long%20long%20query" />
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="8dp"
+            android:layout_marginTop="16dp"
+            tools:background="#00F"
+            android:id="@+id/backgroundFl">
+
+            <com.facebook.drawee.view.SimpleDraweeView
+                android:id="@+id/bigIconImg"
+                android:layout_width="@dimen/tab_icon_size"
+                android:layout_height="@dimen/tab_icon_size"
+                android:layout_gravity="center"
+                tools:placeholderImage="@mipmap/ic_launcher"
+                app:actualImageScaleType="fitCenter" />
+        </FrameLayout>
+    </LinearLayout>
+
+</com.cliqz.widget.CliqzFrameLayout>
\ No newline at end of file
diff --git a/app/src/cliqz/res/values/colors.xml b/app/src/cliqz/res/values/colors.xml
index 20d08e245..744bd04bb 100644
--- a/app/src/cliqz/res/values/colors.xml
+++ b/app/src/cliqz/res/values/colors.xml
@@ -79,4 +79,7 @@
     <color name="progress_bar_color">#2B5993</color>
 
     <color name="search_lock_color">@color/primary_color</color>
+
+    <color name="tabs_overview_background_color">@color/normal_tab_primary_color</color>
+    <color name="tabs_overview_floating_button_color">@color/primary_color</color>
 </resources>
diff --git a/app/src/lumen/res/drawable/lumen_logo_start_tab.xml b/app/src/lumen/res/drawable/logo_start_tab.xml
similarity index 100%
rename from app/src/lumen/res/drawable/lumen_logo_start_tab.xml
rename to app/src/lumen/res/drawable/logo_start_tab.xml
diff --git a/app/src/lumen/res/drawable/tabs_overview_header_gradient.xml b/app/src/lumen/res/drawable/tabs_overview_header_gradient.xml
new file mode 100644
index 000000000..e1d859d12
--- /dev/null
+++ b/app/src/lumen/res/drawable/tabs_overview_header_gradient.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:constantSize="true">
+    <item app:state_incognito="true">
+        <shape android:shape="rectangle">
+            <gradient
+                android:startColor="#484c5a"
+                android:endColor="#3B3F49"
+                android:angle="270" />
+
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <gradient
+                android:startColor="#CCCECF"
+                android:endColor="#BDBDBF"
+                android:angle="270" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/lumen/res/layout-land/deckview_tab_layout.xml b/app/src/lumen/res/layout-land/deckview_tab_layout.xml
new file mode 100644
index 000000000..f58ef3ddb
--- /dev/null
+++ b/app/src/lumen/res/layout-land/deckview_tab_layout.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.cliqz.widget.CliqzFrameLayout 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/tabCl"
+    android:layout_width="match_parent"
+    android:layout_height="366dp"
+    android:background="#E6E7E9">
+
+    <com.cliqz.widget.CliqzTextView
+        android:id="@+id/titleTv"
+        android:layout_width="match_parent"
+        android:layout_height="46dp"
+        android:paddingEnd="66dp"
+        android:paddingStart="88dp"
+        android:gravity="center_vertical"
+        android:ellipsize="end"
+        android:lines="1"
+        android:singleLine="true"
+        android:textSize="15sp"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        android:background="@drawable/tabs_overview_header_gradient"
+        tools:text="A possibly very very very long title" />
+
+    <ImageView
+        android:id="@+id/favIconImg"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="46dp"
+        tools:srcCompat="@android:drawable/ic_media_play"
+        tools:background="#6D6" />
+
+    <ImageButton
+        android:id="@+id/closeBtn"
+        style="@style/Widget.AppCompat.ImageButton"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_gravity="start"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="8dp"
+        android:background="@null"
+        app:srcCompat="@drawable/ic_clear_black" />
+
+    <!-- Keeping this View just for Cliqz Browser compability -->
+    <TextView
+        android:id="@+id/urlTv"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="gone"/>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="46dp"
+        android:id="@+id/backgroundFl"
+        tools:background="#66D">
+
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/bigIconImg"
+            android:layout_width="@dimen/tab_icon_size"
+            android:layout_height="@dimen/tab_icon_size"
+            android:layout_gravity="center"
+            tools:placeholderImage="@mipmap/ic_launcher"
+            app:actualImageScaleType="fitCenter"
+            tools:background="#D66"/>
+    </FrameLayout>
+
+</com.cliqz.widget.CliqzFrameLayout>
\ No newline at end of file
diff --git a/app/src/lumen/res/layout/deckview_tab_layout.xml b/app/src/lumen/res/layout/deckview_tab_layout.xml
new file mode 100644
index 000000000..97a35cb87
--- /dev/null
+++ b/app/src/lumen/res/layout/deckview_tab_layout.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.cliqz.widget.CliqzFrameLayout 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/tabCl"
+    android:layout_width="match_parent"
+    android:layout_height="366dp"
+    android:background="#E6E7E9">
+
+    <com.cliqz.widget.CliqzTextView
+        android:id="@+id/titleTv"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:paddingEnd="66dp"
+        android:paddingStart="72dp"
+        android:gravity="center_vertical"
+        android:ellipsize="end"
+        android:lines="1"
+        android:singleLine="true"
+        android:textSize="15sp"
+        android:textColor="@color/black"
+        android:textStyle="bold"
+        android:background="@drawable/tabs_overview_header_gradient"
+        tools:text="A possibly very very very long title" />
+
+    <ImageView
+        android:id="@+id/favIconImg"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="10dp"
+        tools:srcCompat="@android:drawable/ic_media_play"
+        tools:background="#6D6" />
+
+    <ImageButton
+        android:id="@+id/closeBtn"
+        style="@style/Widget.AppCompat.ImageButton"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_gravity="end"
+        android:background="@null"
+        app:srcCompat="@drawable/ic_clear_black" />
+
+    <!-- Keeping this View just for Cliqz Browser compability -->
+    <TextView
+        android:id="@+id/urlTv"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="gone"/>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="50dp"
+        android:id="@+id/backgroundFl"
+        tools:background="#66D">
+
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/bigIconImg"
+            android:layout_width="@dimen/tab_icon_size"
+            android:layout_height="@dimen/tab_icon_size"
+            android:layout_gravity="center"
+            tools:placeholderImage="@mipmap/ic_launcher"
+            app:actualImageScaleType="fitCenter"
+            tools:background="#D66"/>
+    </FrameLayout>
+
+</com.cliqz.widget.CliqzFrameLayout>
\ No newline at end of file
diff --git a/app/src/lumen/res/layout/fragment_freshtab_welcome_msg.xml b/app/src/lumen/res/layout/fragment_freshtab_welcome_msg.xml
index c4ff78a7c..b26e92896 100644
--- a/app/src/lumen/res/layout/fragment_freshtab_welcome_msg.xml
+++ b/app/src/lumen/res/layout/fragment_freshtab_welcome_msg.xml
@@ -13,7 +13,7 @@
         android:layout_width="137dp"
         android:layout_height="137dp"
         android:contentDescription="@string/lumen_logo_description"
-        app:srcCompat="@drawable/lumen_logo_start_tab" />
+        app:srcCompat="@drawable/logo_start_tab" />
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/app/src/lumen/res/values/colors.xml b/app/src/lumen/res/values/colors.xml
index 1e3b6f626..abccfa2b2 100644
--- a/app/src/lumen/res/values/colors.xml
+++ b/app/src/lumen/res/values/colors.xml
@@ -45,4 +45,7 @@
     <color name="lumen_color_grey_text">#80FFFFFF</color>
     <color name="lumen_disabled_gray">#4E5363</color>
     <color name="lumen_color_blue_primary_opaque">#801B9CFC</color>
+
+    <color name="tabs_overview_background_color">@color/primary_color</color>
+    <color name="tabs_overview_floating_button_color">@color/bond_general_color_blue</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/lumen/res/values/dimens.xml b/app/src/lumen/res/values/dimens.xml
index df7282ed3..b4fadde6b 100644
--- a/app/src/lumen/res/values/dimens.xml
+++ b/app/src/lumen/res/values/dimens.xml
@@ -7,4 +7,5 @@
     <dimen name="dashboard_item_content_size">14sp</dimen>
     <dimen name="normal_text_size">14sp</dimen>
     <dimen name="title_text_size">19sp</dimen>
+    <dimen name="tab_icon_size">126dp</dimen>
 </resources>
diff --git a/app/src/main/java/com/cliqz/deckview/DeckLayoutManager.java b/app/src/main/java/com/cliqz/deckview/DeckLayoutManager.java
index 585857fb7..953513e78 100644
--- a/app/src/main/java/com/cliqz/deckview/DeckLayoutManager.java
+++ b/app/src/main/java/com/cliqz/deckview/DeckLayoutManager.java
@@ -1,12 +1,13 @@
 package com.cliqz.deckview;
 
 import android.content.res.Configuration;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.View.MeasureSpec;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * @author Stefano Pacifici
  */
@@ -249,7 +250,7 @@ private float calculateMaxScroll(RecyclerView.State state) {
         }
     }
 
-    private void updateViews(@NonNull  RecyclerView.Recycler recycler, RecyclerView.State state) {
+    private void updateViews(@NonNull RecyclerView.Recycler recycler, RecyclerView.State state) {
         final int firstVisible = firstVisibleCard(state);
 
         // We have to remove all the cards if the item count is 0
@@ -291,6 +292,7 @@ private void updateViews(@NonNull  RecyclerView.Recycler recycler, RecyclerView.
             final View view;
             if (viewIndex < getChildCount()) {
                 view = getChildAt(viewIndex);
+                assert view != null;
                 final RecyclerView.LayoutParams params =
                         (RecyclerView.LayoutParams) view.getLayoutParams();
                 if (params.isItemRemoved() && !state.isPreLayout()) {
@@ -350,7 +352,7 @@ public void scrollToPosition(int position) {
     }
 
     @Override
-    public void onItemsRemoved(RecyclerView recyclerView, int positionStart, int itemCount) {
+    public void onItemsRemoved(@NonNull RecyclerView recyclerView, int positionStart, int itemCount) {
         super.onItemsRemoved(recyclerView, positionStart, itemCount);
         final int remaining = getItemCount();
         if (remaining >= REMAINDERS_NO + 1 && positionStart == remaining) {
diff --git a/app/src/main/java/com/cliqz/deckview/TabsDeckViewAdapter.java b/app/src/main/java/com/cliqz/deckview/TabsDeckViewAdapter.java
index 616a5c8bd..b3524f96f 100644
--- a/app/src/main/java/com/cliqz/deckview/TabsDeckViewAdapter.java
+++ b/app/src/main/java/com/cliqz/deckview/TabsDeckViewAdapter.java
@@ -6,6 +6,7 @@
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
@@ -13,6 +14,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.cliqz.browser.BuildConfig;
 import com.cliqz.browser.R;
 import com.cliqz.browser.main.CliqzBrowserState;
 import com.cliqz.browser.main.CliqzBrowserState.Mode;
@@ -21,6 +23,7 @@
 import com.cliqz.jsengine.JSBridge;
 import com.facebook.react.bridge.ReadableMap;
 
+
 /**
  * @author Stefano Pacifici
  * @author Ravjit Singh
@@ -31,33 +34,47 @@ class TabsDeckViewAdapter extends RecyclerView.Adapter<ViewHolder> {
     private static final String BACKGROUND_IMAGE_KEY = "backgroundImage";
     private static final String RESULT_KEY = "result";
     private static final String TEXT_KEY = "text";
+    private static final int INCOGNITO_TYPE = 23;
+    private static final int REGULAR_TYPE = 19;
     private final TabsDeckView tabsDeckView;
     private final LayoutInflater inflater;
     private final Drawable tabDefaultIcon;
     private final Context context;
     private static final String GET_LOGO_FUNCTION = "getLogoDetails";
     private final Bitmap defaultFavicon;
+    private final int defaultBackgroundColor;
 
     TabsDeckViewAdapter(TabsDeckView tabsDeckView) {
         this.tabsDeckView = tabsDeckView;
         this.context = tabsDeckView.getContext();
         this.inflater = LayoutInflater.from(context);
-        this.tabDefaultIcon = ContextCompat.getDrawable(context, R.drawable.ic_cliqz_tab);
+        this.tabDefaultIcon = ContextCompat.getDrawable(context, R.drawable.logo_start_tab);
         this.defaultFavicon = BitmapFactory
                 .decodeResource(context.getResources(), R.drawable.ic_webpage);
+        this.defaultBackgroundColor = BuildConfig.IS_LUMEN ?
+                ContextCompat.getColor(context, R.color.secondary_color) :
+                ContextCompat.getColor(context, R.color.accent_color);
     }
 
+    @NonNull
     @Override
-    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        final View card = inflater.inflate(R.layout.deckview_tab_layout, parent, false);
-        return new ViewHolder(tabsDeckView, card);
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        final View card;
+        card = inflater.inflate(R.layout.deckview_tab_layout, parent, false);
+        if (viewType == INCOGNITO_TYPE) {
+            card.setId(R.id.incognito_tab_id);
+        } else {
+            card.setId(R.id.regular_tab_id);
+        }
+        final ViewHolder viewHolder = new ViewHolder(tabsDeckView, card);
+        viewHolder.titleTv.setIncognito(viewType == INCOGNITO_TYPE);
+        viewHolder.rootView.setIncognito(viewType == INCOGNITO_TYPE);
+        return viewHolder;
     }
 
     @Override
-    public void onBindViewHolder(ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         final CliqzBrowserState entry = tabsDeckView.entries.get(position);
-        final int textColor = entry.isIncognito() ? R.color.normal_tab_primary_color :
-                R.color.incognito_tab_primary_color;
         final String entryTitle = entry.getTitle();
         final String entryUrl = entry.getUrl();
         final Mode mode = entry.getMode();
@@ -70,10 +87,6 @@ public void onBindViewHolder(ViewHolder holder, int position) {
             url = context.getString(R.string.action_new_tab);
             title = context.getString(R.string.home_title);
         }
-        holder.rootView.setBackground(ContextCompat.getDrawable(context,
-                entry.isIncognito() ? R.drawable.tab_background_dark : R.drawable.tab_background));
-        holder.rootView.setId(entry.isIncognito() ? R.id.incognito_tab_id: R.id.regular_tab_id);
-        holder.titleTv.setTextColor(ContextCompat.getColor(context, textColor));
         holder.urlTv.setText(url);
         holder.titleTv.setText(title);
 
@@ -89,10 +102,16 @@ public void onBindViewHolder(ViewHolder holder, int position) {
             holder.bigIconIV.getHierarchy()
                     .setImage(tabDefaultIcon, 1.0f, true);
             holder.backgroundView
-                    .setBackgroundColor(ContextCompat.getColor(context,R.color.accent_color));
+                    .setBackgroundColor(defaultBackgroundColor);
         }
     }
 
+    @Override
+    public int getItemViewType(int position) {
+        final CliqzBrowserState entry = tabsDeckView.entries.get(position);
+        return entry.isIncognito() ? INCOGNITO_TYPE : REGULAR_TYPE;
+    }
+
     @Override
     public int getItemCount() {
         return tabsDeckView.entries.size();
@@ -118,8 +137,8 @@ private class LogoMetadataResult implements JSBridge.Callback {
 
         @Override
         public void callback(final ReadableMap content) {
-
             final ReadableMap result = content.getMap(RESULT_KEY);
+            assert result != null;
             final Resources resources = context.getResources();
             final String rawIconUrl = result.hasKey(BACKGROUND_IMAGE_KEY) ?
                     result.getString(BACKGROUND_IMAGE_KEY) : null;
@@ -128,20 +147,18 @@ public void callback(final ReadableMap content) {
             final @ColorInt int color = result.hasKey(BACKGROUND_COLOR_KEY) ?
                     0xff000000 | decodeColor(result.getString(BACKGROUND_COLOR_KEY)) :
                     ContextCompat.getColor(context, R.color.accent_color);
+            assert text != null;
             final Drawable textDrawable = new DefaultIconDrawable(text, color,
                     resources.getDimensionPixelSize(R.dimen.fallback_logo_text_size),
                     0);
             final int logoSize = (int) resources.getDimension(R.dimen.tab_icon_size);
             final String iconUrl = Logo.getUriFromSvgUri(rawIconUrl, logoSize, logoSize);
-            tabsDeckView.post(new Runnable() {
-                @Override
-                public void run() {
-                    holder.bigIconIV.getHierarchy().setFailureImage(text.isEmpty() ?
-                            tabDefaultIcon: textDrawable);
-                    holder.bigIconIV.setImageURI(iconUrl);
-                    final int noAlphaColor = 0xff000000 | color;
-                    holder.backgroundView.setBackgroundColor(noAlphaColor);
-                }
+            tabsDeckView.post(() -> {
+                holder.bigIconIV.getHierarchy().setFailureImage(text.isEmpty() ?
+                        tabDefaultIcon: textDrawable);
+                holder.bigIconIV.setImageURI(iconUrl);
+                final int noAlphaColor = 0xff000000 | color;
+                holder.backgroundView.setBackgroundColor(noAlphaColor);
             });
         }
     }
diff --git a/app/src/main/java/com/cliqz/deckview/ViewHolder.java b/app/src/main/java/com/cliqz/deckview/ViewHolder.java
index 7a1190e35..f29d94c27 100644
--- a/app/src/main/java/com/cliqz/deckview/ViewHolder.java
+++ b/app/src/main/java/com/cliqz/deckview/ViewHolder.java
@@ -7,16 +7,18 @@
 import android.widget.TextView;
 
 import com.cliqz.browser.R;
+import com.cliqz.widget.CliqzFrameLayout;
 import com.facebook.drawee.view.SimpleDraweeView;
+import com.cliqz.widget.CliqzTextView;
 
 /**
  * @author Stefano Pacifici
  */
 class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-    final TextView titleTv;
+    final CliqzTextView titleTv;
     final TextView urlTv;
     final View backgroundView;
-    final View rootView;
+    final CliqzFrameLayout rootView;
     final ImageView favIconIV;
     final SimpleDraweeView bigIconIV;
 
@@ -27,7 +29,7 @@ class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener
         titleTv = itemView.findViewById(R.id.titleTv);
         urlTv = itemView.findViewById(R.id.urlTv);
         backgroundView = itemView.findViewById(R.id.backgroundFl);
-        rootView = itemView;
+        rootView = (CliqzFrameLayout) itemView;
         favIconIV = itemView.findViewById(R.id.favIconImg);
         bigIconIV = itemView.findViewById(R.id.bigIconImg);
         final ImageButton closeButton = itemView.findViewById(R.id.closeBtn);
diff --git a/app/src/main/java/com/cliqz/widget/CliqzFrameLayout.java b/app/src/main/java/com/cliqz/widget/CliqzFrameLayout.java
new file mode 100644
index 000000000..679ad05f0
--- /dev/null
+++ b/app/src/main/java/com/cliqz/widget/CliqzFrameLayout.java
@@ -0,0 +1,56 @@
+/**
+ * Generated source file do not edit
+ */
+package com.cliqz.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.cliqz.browser.R;
+
+public class CliqzFrameLayout extends android.widget.FrameLayout {
+
+    private static final int[] STATE_INCOGNITO = {R.attr.state_incognito};
+
+    private boolean mIsIncognito = false;
+
+    public CliqzFrameLayout(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public CliqzFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public CliqzFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected int[] onCreateDrawableState(int extraSpace) {
+        if (mIsIncognito) {
+            // We are going to add 1 extra state.
+            final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+            mergeDrawableStates(drawableState, STATE_INCOGNITO);
+            return drawableState;
+        } else {
+            return super.onCreateDrawableState(extraSpace);
+        }
+    }
+
+
+    public final void setIncognito(boolean value) {
+        if (mIsIncognito != value) {
+            mIsIncognito = value;
+            refreshDrawableState();
+        }
+    }
+
+    public final boolean isIncognito() {
+        return mIsIncognito;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cliqz/widget/CliqzTextView.java b/app/src/main/java/com/cliqz/widget/CliqzTextView.java
new file mode 100644
index 000000000..a8e004d67
--- /dev/null
+++ b/app/src/main/java/com/cliqz/widget/CliqzTextView.java
@@ -0,0 +1,56 @@
+/**
+ * Generated source file do not edit
+ */
+package com.cliqz.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.cliqz.browser.R;
+
+public class CliqzTextView extends androidx.appcompat.widget.AppCompatTextView {
+
+    private static final int[] STATE_INCOGNITO = {R.attr.state_incognito};
+
+    private boolean mIsIncognito = false;
+
+    public CliqzTextView(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public CliqzTextView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public CliqzTextView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected int[] onCreateDrawableState(int extraSpace) {
+        if (mIsIncognito) {
+            // We are going to add 1 extra state.
+            final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+            mergeDrawableStates(drawableState, STATE_INCOGNITO);
+            return drawableState;
+        } else {
+            return super.onCreateDrawableState(extraSpace);
+        }
+    }
+
+
+    public final void setIncognito(boolean value) {
+        if (mIsIncognito != value) {
+            mIsIncognito = value;
+            refreshDrawableState();
+        }
+    }
+
+    public final boolean isIncognito() {
+        return mIsIncognito;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/deckview_tab_layout.xml b/app/src/main/res/layout-land/deckview_tab_layout.xml
deleted file mode 100644
index 9438082a7..000000000
--- a/app/src/main/res/layout-land/deckview_tab_layout.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-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/tabCl"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/deckview_item_background">
-
-    <ImageButton
-        android:id="@+id/closeBtn"
-        style="@style/Widget.AppCompat.ImageButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:background="@null"
-        app:srcCompat="@drawable/ic_clear_black"
-        android:layout_marginLeft="0dp"
-        android:layout_marginStart="0dp"
-        app:layout_constraintLeft_toLeftOf="@+id/backgroundFl"
-        app:layout_constraintTop_toTopOf="@+id/favIconImg"
-        android:layout_marginTop="0dp"
-        app:layout_constraintBottom_toBottomOf="@+id/favIconImg"
-        android:layout_marginBottom="0dp"
-        tools:ignore="ContentDescription"
-        />
-
-    <TextView
-        android:id="@+id/titleTv"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:layout_marginStart="16dp"
-        android:ellipsize="end"
-        android:lines="1"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textColor="@color/black"
-        android:textStyle="bold"
-        tools:text="A possibly very very very long title"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="8dp"
-        android:layout_marginRight="8dp"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toRightOf="@+id/favIconImg"
-        android:layout_marginLeft="8dp"
-        app:layout_constraintHorizontal_bias="0.242" />
-
-    <TextView
-        android:id="@+id/urlTv"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="0dp"
-        android:layout_marginRight="0dp"
-        android:layout_marginTop="8dp"
-        android:ellipsize="middle"
-        android:lines="1"
-        android:singleLine="true"
-        android:textColor="@color/primary_color"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintLeft_toLeftOf="@+id/backgroundFl"
-        app:layout_constraintRight_toRightOf="@+id/backgroundFl"
-        app:layout_constraintTop_toBottomOf="@+id/titleTv"
-        tools:text="http://it.m.subdomain.example.com/folder/folder/search.php?q=long%20long%20query" />
-
-    <ImageView
-        android:id="@+id/favIconImg"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginStart="8dp"
-        app:srcCompat="@android:drawable/ic_media_play"
-        app:layout_constraintTop_toTopOf="@+id/titleTv"
-        android:layout_marginTop="0dp"
-        app:layout_constraintBottom_toBottomOf="@+id/titleTv"
-        android:layout_marginBottom="0dp"
-        app:layout_constraintLeft_toRightOf="@+id/closeBtn"
-        android:layout_marginLeft="8dp"
-        tools:ignore="ContentDescription"
-        />
-
-    <FrameLayout
-        android:id="@+id/backgroundFl"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/urlTv"
-        app:layout_constraintVertical_bias="0.0"
-        tools:background="#00F">
-
-        <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/bigIconImg"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_gravity="center"
-            app:actualImageScaleType="fitCenter"
-            app:placeholderImage="@mipmap/ic_launcher" />
-    </FrameLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/deckview_tab_layout.xml b/app/src/main/res/layout/deckview_tab_layout.xml
deleted file mode 100644
index a56a76c7a..000000000
--- a/app/src/main/res/layout/deckview_tab_layout.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-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/tabCl"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/tab_background">
-
-    <ImageView
-        android:id="@+id/favIconImg"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_marginStart="8dp"
-        app:srcCompat="@android:drawable/ic_media_play"
-        android:layout_marginLeft="8dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="8dp" />
-
-    <ImageButton
-        android:id="@+id/closeBtn"
-        style="@style/Widget.AppCompat.ImageButton"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginEnd="8dp"
-        android:background="@null"
-        android:layout_marginTop="8dp"
-        app:layout_constraintBottom_toBottomOf="@+id/favIconImg"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/favIconImg"
-        app:layout_constraintVertical_bias="1.0"
-        app:srcCompat="@drawable/ic_clear_black" />
-
-    <TextView
-        android:id="@+id/titleTv"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:ellipsize="end"
-        android:lines="1"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textColor="@color/black"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/favIconImg"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintLeft_toRightOf="@+id/favIconImg"
-        app:layout_constraintRight_toLeftOf="@+id/closeBtn"
-        app:layout_constraintTop_toTopOf="@+id/favIconImg"
-        app:layout_constraintVertical_bias="0.375"
-        tools:text="A possibly very very very long title" />
-
-    <TextView
-        android:id="@+id/urlTv"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginTop="8dp"
-        android:ellipsize="middle"
-        android:singleLine="true"
-        android:textColor="@color/primary_color"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/titleTv"
-        tools:text="http://it.m.subdomain.example.com/folder/folder/search.php?q=long%20long%20query" />
-
-    <FrameLayout
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/urlTv"
-        tools:background="#00F"
-        android:id="@+id/backgroundFl">
-
-        <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/bigIconImg"
-            android:layout_width="@dimen/tab_icon_size"
-            android:layout_height="@dimen/tab_icon_size"
-            android:layout_gravity="center"
-            tools:placeholderImage="@mipmap/ic_launcher"
-            app:actualImageScaleType="fitCenter" />
-    </FrameLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tabs_overview.xml b/app/src/main/res/layout/tabs_overview.xml
index f312a29f3..395770fda 100644
--- a/app/src/main/res/layout/tabs_overview.xml
+++ b/app/src/main/res/layout/tabs_overview.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/normal_tab_primary_color">
+    android:background="@color/tabs_overview_background_color">
 
     <com.cliqz.deckview.TabsDeckView
         android:id="@+id/tabs_list_view"
@@ -20,8 +20,5 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:src="@drawable/ic_action_add_white"
-        app:backgroundTint="?attr/colorPrimary"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true" />
-</RelativeLayout>
+        app:backgroundTint="@color/tabs_overview_floating_button_color" />
+</FrameLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index dd5625361..c93899675 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -31,4 +31,8 @@
     <declare-styleable name="TabsCounter">
         <attr name="color" format="color" />
     </declare-styleable>
+    
+    <declare-styleable name="IncognitoState">
+        <attr name="state_incognito" format="boolean" />
+    </declare-styleable>
 </resources>
\ No newline at end of file

From e49ba27d100698e906d6ad8b70c82517c370fa6a Mon Sep 17 00:00:00 2001
From: ravjit-cliqz <ravjit@cliqz.com>
Date: Mon, 15 Jul 2019 12:15:55 +0200
Subject: [PATCH 30/57]  AP-373 vpn crash after subscription  (#159)

* AP-373 Get VPN credentials after subscription

* AP-373 vpn crash after subscription
---
 app/build.gradle                              |   2 +-
 .../com/cliqz/browser/app/AppComponent.java   |  14 ++
 .../com/cliqz/browser/app/AppComponent.java   |  16 ++
 .../controlcenter/ControlCenterDialog.java    |   3 +-
 .../main/FlavoredActivityComponent.java       |   1 -
 .../browser/purchases/PurchaseFragment.kt     |   3 +
 .../browser/purchases/PurchasesManager.kt     |  17 +-
 .../purchases/trial/TrialPeriodRemoteRepo.kt  | 145 ++++++++----------
 .../java/com/cliqz/browser/vpn/VpnPanel.java  |  28 +++-
 ...ppComponent.java => BaseAppComponent.java} |   7 +-
 .../java/com/cliqz/browser/main/Messages.java |   3 +
 11 files changed, 135 insertions(+), 104 deletions(-)
 create mode 100644 app/src/cliqz/java/com/cliqz/browser/app/AppComponent.java
 create mode 100644 app/src/lumen/java/com/cliqz/browser/app/AppComponent.java
 rename app/src/main/java/com/cliqz/browser/app/{AppComponent.java => BaseAppComponent.java} (96%)

diff --git a/app/build.gradle b/app/build.gradle
index c90db4b42..1c8bb310a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -224,7 +224,7 @@ dependencies {
     lumenImplementation 'com.revenuecat.purchases:purchases:2.1.2'
 
     // vpn module
-    lumenImplementation 'com.cliqz:com.cliqz.vpnlib:1.0.3'
+    lumenImplementation 'com.cliqz:com.cliqz.vpnlib:1.0.4'
 
     // Testing-only dependencies
     testImplementation 'junit:junit:4.12'
diff --git a/app/src/cliqz/java/com/cliqz/browser/app/AppComponent.java b/app/src/cliqz/java/com/cliqz/browser/app/AppComponent.java
new file mode 100644
index 000000000..6c6e9f898
--- /dev/null
+++ b/app/src/cliqz/java/com/cliqz/browser/app/AppComponent.java
@@ -0,0 +1,14 @@
+package com.cliqz.browser.app;
+
+import javax.inject.Singleton;
+
+import dagger.Component;
+
+/**
+ * @author Ravjit Uppal
+ */
+@Singleton
+@Component(modules = {AppModule.class})
+public interface AppComponent extends BaseAppComponent {
+
+}
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/app/AppComponent.java b/app/src/lumen/java/com/cliqz/browser/app/AppComponent.java
new file mode 100644
index 000000000..58c02e935
--- /dev/null
+++ b/app/src/lumen/java/com/cliqz/browser/app/AppComponent.java
@@ -0,0 +1,16 @@
+package com.cliqz.browser.app;
+
+import com.cliqz.browser.purchases.trial.TrialPeriodRemoteRepo;
+
+import javax.inject.Singleton;
+
+import dagger.Component;
+
+/**
+ * @author Ravjit Uppal
+ */
+@Singleton
+@Component(modules = {AppModule.class})
+public interface AppComponent extends BaseAppComponent {
+    void inject(TrialPeriodRemoteRepo trialPeriodRemoteRepo);
+}
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
index 29d75b80f..2cf201c0c 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
@@ -198,7 +198,8 @@ public void onConfigurationChanged(Configuration newConfig) {
     }
 
     private void hideSubscribeButton(boolean isDashboardEnabled) {
-        toggleTabLayout(isDashboardEnabled);
+        toggleTabLayout(isDashboardEnabled &&
+                preferenceManager.isAttrackEnabled() && preferenceManager.getAdBlockEnabled());
         ultimateProtectionSwitch.setChecked(preferenceManager.isAttrackEnabled() &&
                 preferenceManager.getAdBlockEnabled());
         subscribeUltimateProtectionView.setVisibility(isDashboardEnabled ? View.GONE : View.VISIBLE);
diff --git a/app/src/lumen/java/com/cliqz/browser/main/FlavoredActivityComponent.java b/app/src/lumen/java/com/cliqz/browser/main/FlavoredActivityComponent.java
index e2861d663..9ab600fc3 100644
--- a/app/src/lumen/java/com/cliqz/browser/main/FlavoredActivityComponent.java
+++ b/app/src/lumen/java/com/cliqz/browser/main/FlavoredActivityComponent.java
@@ -2,7 +2,6 @@
 
 import com.cliqz.browser.annotations.PerActivity;
 import com.cliqz.browser.controlcenter.ControlCenterDialog;
-import com.cliqz.browser.controlcenter.ControlCenterHelper;
 import com.cliqz.browser.controlcenter.DashboardFragment;
 import com.cliqz.browser.purchases.PurchaseFragment;
 import com.cliqz.browser.purchases.PurchasesManager;
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
index ecdd56089..8dc7397be 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
@@ -236,6 +236,9 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
         }
         purchasesManager.purchase.sku = sku
         purchasesManager.purchase.isASubscriber = true
+        if (purchasesManager.purchase.isVpnEnabled) {
+            purchasesManager.loadTrialPeriodInfo()
+        }
         bus.post(Messages.PurchaseCompleted())
         dismiss()
     }
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
index 3b7327828..0e8ffe420 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
@@ -25,7 +25,6 @@ class PurchasesManager(
         ReceivePurchaserInfoListener {
 
     private val trialPeriodLocalRepo = TrialPeriodLocalRepo(preferenceManager)
-    private val trialPeriodRemoteRepo = TrialPeriodRemoteRepo(context)
 
     var purchase = Purchase()
 
@@ -36,8 +35,8 @@ class PurchasesManager(
     override fun onTrialPeriodResponse(serverData: ServerData?) {
         this.serverData = serverData
         isLoading = false
-
         bus.post(Messages.OnTrialPeriodResponse())
+        trialPeriodLocalRepo.saveTrialPeriodInfo(serverData)
     }
 
     override fun onReceived(purchaserInfo: PurchaserInfo) {
@@ -60,7 +59,7 @@ class PurchasesManager(
             purchase.isASubscriber = false
         }
         // Get Trial Period data and vpn username, password.
-        this.loadTrialPeriodInfo(this@PurchasesManager)
+        this.loadTrialPeriodInfo()
     }
 
     override fun onError(error: PurchasesError) {
@@ -75,18 +74,12 @@ class PurchasesManager(
         }
     }
 
-    private fun loadTrialPeriodInfo(trialPeriodResponseListener: TrialPeriodResponseListener) {
+    fun loadTrialPeriodInfo() {
         // Read trial period object from cache
         trialPeriodLocalRepo.loadPurchaseInfo(object : TrialPeriodResponseListener {
             override fun onTrialPeriodResponse(serverData: ServerData?) {
-                trialPeriodResponseListener.onTrialPeriodResponse(serverData)
-                // TODO: Can avoid querying network if not needed.
-                trialPeriodRemoteRepo.loadPurchaseInfo(object : TrialPeriodResponseListener {
-                    override fun onTrialPeriodResponse(serverData: ServerData?) {
-                        trialPeriodResponseListener.onTrialPeriodResponse(serverData)
-                        trialPeriodLocalRepo.saveTrialPeriodInfo(serverData)
-                    }
-                })
+                this@PurchasesManager.onTrialPeriodResponse(serverData)
+                TrialPeriodRemoteRepo(context, this@PurchasesManager).execute()
             }
         })
     }
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt b/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt
index b2af20ec5..66ca356d4 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt
@@ -1,13 +1,15 @@
 package com.cliqz.browser.purchases.trial
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.net.Uri
 import android.os.AsyncTask
 import android.provider.Settings
-import com.cliqz.browser.CliqzConfig
 import android.util.Log
+import com.cliqz.browser.CliqzConfig
+import com.cliqz.browser.app.BrowserApp
+import com.cliqz.browser.main.Messages
 import com.cliqz.browser.utils.HttpHandler
+import com.cliqz.nove.Bus
 import com.revenuecat.purchases.Purchases
 import de.blinkt.openvpn.ConfigConverter
 import de.blinkt.openvpn.core.ProfileManager
@@ -18,97 +20,86 @@ import java.io.FileWriter
 import java.io.IOException
 import java.net.HttpURLConnection
 import java.net.URL
+import javax.inject.Inject
 
 private val TAG = TrialPeriodRemoteRepo::class.java.simpleName
 private const val CONTENT_TYPE_JSON = "application/json"
 
 private val HEADERS = mapOf("x-api-key" to CliqzConfig.VPN_API_KEY)
 
-class TrialPeriodRemoteRepo(private val context: Context) {
-
-    fun loadPurchaseInfo(trialPeriodResponseListener: TrialPeriodResponseListener) {
-        TrialPeriodHandler.TrialPeriodHandlerTask(context, object : TrialPeriodResponseListener {
-            override fun onTrialPeriodResponse(serverData: ServerData?) {
-                trialPeriodResponseListener.onTrialPeriodResponse(serverData)
-            }
-        }).execute()
-    }
-
-    object TrialPeriodHandler {
-
-        class TrialPeriodHandlerTask() : AsyncTask<Void, Void, ServerData>() {
-
-            private lateinit var requestBody: String
+class TrialPeriodRemoteRepo(private val context: Context,
+                            private val trialPeriodResponseListener: TrialPeriodResponseListener) : AsyncTask<Void, Void, ServerData>() {
 
-            private lateinit var trialPeriodResponseListener: TrialPeriodResponseListener
+    @Inject
+    lateinit var bus: Bus
 
-            private lateinit var context: Context
-
-            @SuppressLint("HardwareIds")
-            constructor(context: Context, trialPeriodResponseListener: TrialPeriodResponseListener) : this() {
-                this.context = context
-                this.trialPeriodResponseListener = trialPeriodResponseListener
-                requestBody = JSONObject()
-                        .put("device_id", Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID))
-                        .put("revenue_cat_token", Purchases.sharedInstance.appUserID)
-                        .toString()
-            }
+    init {
+        BrowserApp.getAppComponent()?.inject(this)
+    }
 
-            override fun doInBackground(vararg params: Void): ServerData {
-                val responseJSON = HttpHandler.sendRequest("POST", URL(CliqzConfig.CREDENTIAL_URL),
-                        CONTENT_TYPE_JSON, HEADERS, requestBody)
-                var trialDaysLeft = 0
-                var userName = ""
-                var password = ""
-                if (responseJSON != null && responseJSON.get("status_code") == HttpURLConnection.HTTP_OK) {
-                    trialDaysLeft = responseJSON.getJSONObject("body").getString("trial_days_left").toInt()
-                    userName = responseJSON.getJSONObject("body").getJSONObject("credentials")
-                            .getString("username")
-                    password = responseJSON.getJSONObject("body").getJSONObject("credentials")
-                            .getString("password")
-                    val vpnCountries = responseJSON.getJSONObject("body").getJSONArray("nodes")
-                    for (i in 0 until vpnCountries.length()) {
-                        val country = vpnCountries.getJSONObject(i)
-                        val countryCode = country.getString("countryCode")
-                        val services = country.getJSONArray("services")
-                        var openVpnConfig = ""
-                        for (j in 0 until services.length()) {
-                            val service = services.getJSONObject(j)
-                            if (service.getString("name") == "openvpn" || service.getString("name") == "openvpn/standard") {
-                                openVpnConfig = service.getString("config")
-                            }
-                        }
-                        importVpnProfiles(countryCode, openVpnConfig)
+    override fun doInBackground(vararg params: Void): ServerData {
+        val requestBody = JSONObject()
+                .put("device_id", Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID))
+                .put("revenue_cat_token", Purchases.sharedInstance.appUserID)
+                .toString()
+        val responseJSON = HttpHandler.sendRequest("POST", URL(CliqzConfig.CREDENTIAL_URL),
+                CONTENT_TYPE_JSON, HEADERS, requestBody)
+        var trialDaysLeft = 0
+        var userName = ""
+        var password = ""
+        if (responseJSON != null && responseJSON.get("status_code") == HttpURLConnection.HTTP_OK) {
+            trialDaysLeft = responseJSON.getJSONObject("body").getString("trial_days_left").toInt()
+            userName = responseJSON.getJSONObject("body").getJSONObject("credentials")
+                    .getString("username")
+            password = responseJSON.getJSONObject("body").getJSONObject("credentials")
+                    .getString("password")
+            val vpnCountries = responseJSON.getJSONObject("body").getJSONArray("nodes")
+            for (i in 0 until vpnCountries.length()) {
+                val country = vpnCountries.getJSONObject(i)
+                val countryCode = country.getString("countryCode")
+                val services = country.getJSONArray("services")
+                var openVpnConfig = ""
+                for (j in 0 until services.length()) {
+                    val service = services.getJSONObject(j)
+                    if (service.getString("name") == "openvpn" || service.getString("name") == "openvpn/standard") {
+                        openVpnConfig = service.getString("config")
                     }
                 }
-                return ServerData(trialDaysLeft > 0, trialDaysLeft, userName, password)
+                importVpnProfiles(countryCode, openVpnConfig, vpnCountries.length())
             }
+        }
+        return ServerData(trialDaysLeft > 0, trialDaysLeft, userName, password)
+    }
 
-            override fun onPostExecute(serverData: ServerData) {
-                trialPeriodResponseListener.onTrialPeriodResponse(serverData)
-            }
+    override fun onPostExecute(serverData: ServerData) {
+        trialPeriodResponseListener.onTrialPeriodResponse(serverData)
+    }
 
-            private fun importVpnProfiles(countryCode: String, openVpnConfig: String) {
-                if (openVpnConfig.isEmpty()) {
-                    return
-                }
-                val profileManager = ProfileManager.getInstance(context)
-                if (profileManager.getProfileByName(countryCode) == null) {
-                    val outputDir = context.cacheDir
-                    val outputFile = File.createTempFile(countryCode + "vpn", ".ovpn", outputDir)
-                    outputFile.deleteOnExit()
-                    try {
-                        val bufferedWriter = BufferedWriter(FileWriter(outputFile))
-                        bufferedWriter.write(openVpnConfig)
-                        bufferedWriter.close()
-                    } catch (e: IOException) {
-                        Log.e(TAG, "File write failed: $e")
-                    }
-                    val vpnConfigUri = Uri.fromFile(outputFile)
-                    val configConverter = ConfigConverter(context.applicationContext)
-                    configConverter.startImportTask(vpnConfigUri, countryCode)
+    private fun importVpnProfiles(countryCode: String, openVpnConfig: String, totalProfiles: Int) {
+        if (openVpnConfig.isEmpty()) {
+            return
+        }
+        val profileManager = ProfileManager.getInstance(context)
+        if (profileManager.getProfileByName(countryCode) == null) {
+            val outputDir = context.cacheDir
+            val outputFile = File.createTempFile(countryCode + "vpn", ".ovpn", outputDir)
+            outputFile.deleteOnExit()
+            try {
+                val bufferedWriter = BufferedWriter(FileWriter(outputFile))
+                bufferedWriter.write(openVpnConfig)
+                bufferedWriter.close()
+            } catch (e: IOException) {
+                Log.e(TAG, "File write failed: $e")
+            }
+            val vpnConfigUri = Uri.fromFile(outputFile)
+            val configConverter = ConfigConverter(context.applicationContext)
+            configConverter.setOnProfileImportListener {
+                //No use of posting this message unless all profiles have been imported
+                if (totalProfiles == ProfileManager.getInstance(context).profiles.size) {
+                    bus.post(Messages.OnAllProfilesImported())
                 }
             }
+            configConverter.startImportTask(vpnConfigUri, countryCode)
         }
     }
 }
diff --git a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
index fdfa5b29c..6c58f9c06 100644
--- a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
+++ b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
@@ -4,6 +4,7 @@
 import android.animation.ValueAnimator;
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.Context;
 import android.graphics.Paint;
 import android.graphics.drawable.RotateDrawable;
 import android.os.Bundle;
@@ -19,6 +20,7 @@
 import android.widget.Chronometer;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
@@ -113,11 +115,7 @@ public static VpnPanel create(View source) {
         final Bundle arguments = new Bundle();
         arguments.putInt(KEY_ANCHOR_HEIGHT, source.getHeight());
         dialog.setArguments(arguments);
-        final Collection<VpnProfile> vpnProfiles =
-                ProfileManager.getInstance(source.getContext()).getProfiles();
-        if (vpnProfiles != null && !vpnProfiles.isEmpty()) {
-            dialog.selectedProfile = vpnProfiles.iterator().next();
-        }
+        dialog.setSelectedProfile(source.getContext());
         return dialog;
     }
 
@@ -197,7 +195,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 
     @OnClick(R.id.vpn_country)
     void vpnCountryClicked() {
-        if (selectedProfile != null) {
+        if (selectedProfile != null && purchasesManager.isVpnEnabled()) {
             showVpnCountriesDialog();
         } else {
             unlockVpnDialog();
@@ -211,6 +209,10 @@ void connectClicked() {
                 vpnHandler.disconnectVpn();
                 updateStateToConnect();
             } else {
+                if (selectedProfile == null) {
+                    Toast.makeText(getContext(), "Please try again later", Toast.LENGTH_LONG).show();
+                    return;
+                }
                 vpnHandler.connectVpn(selectedProfile);
             }
         } else {
@@ -358,6 +360,20 @@ private void vpnMsgsChangeDrawable(@DrawableRes int id) {
         DrawableExtensionsKt.drawableStart(mVpnMsgLineTwo, id);
     }
 
+    private void setSelectedProfile(Context context) {
+        final Collection<VpnProfile> vpnProfiles =
+                ProfileManager.getInstance(context).getProfiles();
+        if (vpnProfiles != null && !vpnProfiles.isEmpty()) {
+            selectedProfile = vpnProfiles.iterator().next();
+        }
+    }
+
+    @Subscribe
+    public void onTrialPeriodResponse(Messages.OnAllProfilesImported onTrialPeriodResponse) {
+        setSelectedProfile(getDialog().getContext());
+        mSelectedCountry.setText(selectedProfile.getName());
+    }
+
     @Subscribe
     void dismissVpnPanel(Messages.DismissVpnPanel event) {
         dismissAllowingStateLoss();
diff --git a/app/src/main/java/com/cliqz/browser/app/AppComponent.java b/app/src/main/java/com/cliqz/browser/app/BaseAppComponent.java
similarity index 96%
rename from app/src/main/java/com/cliqz/browser/app/AppComponent.java
rename to app/src/main/java/com/cliqz/browser/app/BaseAppComponent.java
index 6e0bd176a..7f7d49966 100644
--- a/app/src/main/java/com/cliqz/browser/app/AppComponent.java
+++ b/app/src/main/java/com/cliqz/browser/app/BaseAppComponent.java
@@ -37,20 +37,15 @@
 import com.cliqz.browser.widget.SearchBar;
 import com.cliqz.jsengine.Engine;
 
-import javax.inject.Singleton;
-
 import acr.browser.lightning.activity.SettingsActivity;
 import acr.browser.lightning.database.HistoryDatabase;
 import acr.browser.lightning.download.LightningDownloadListener;
 import acr.browser.lightning.preference.PreferenceManager;
-import dagger.Component;
 
 /**
  * @author Stefano Pacifici
  */
-@Singleton
-@Component(modules = {AppModule.class})
-public interface AppComponent {
+public interface BaseAppComponent {
 
     PreferenceManager getPreferenceManager();
 
diff --git a/app/src/main/java/com/cliqz/browser/main/Messages.java b/app/src/main/java/com/cliqz/browser/main/Messages.java
index 5bebb4d54..047a6136d 100644
--- a/app/src/main/java/com/cliqz/browser/main/Messages.java
+++ b/app/src/main/java/com/cliqz/browser/main/Messages.java
@@ -296,4 +296,7 @@ public static class SearchBarBackPressed {
 
     public static class SearchBarClearPressed {
     }
+
+    public static class OnAllProfilesImported {
+    }
 }

From 57dbc2b2222d21ccbfeedea094ef2572e158a065 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Mon, 15 Jul 2019 12:16:23 +0200
Subject: [PATCH 31/57] AP-355-2 font colors, typefaces in deck view (#160)

---
 .../java/com/cliqz/utils/SpannableUtils.java  |  14 ++-
 .../res/drawable/tab_default_favicon.xml      |   3 +
 .../res/layout-land/deckview_tab_layout.xml   |   6 +-
 .../cliqz/res/layout/deckview_tab_layout.xml  |  14 +--
 .../browser/extensions/DrawableExtensions.kt  |   5 +-
 .../browser/overview/OverviewFragment.java    |   7 +-
 app/src/lumen/res/drawable/ic_tab_close.xml   |   7 ++
 .../res/drawable/tab_default_favicon.xml      |  11 ++
 .../lumen/res/drawable/tabs_title_color.xml   |   5 +
 .../res/layout-land/deckview_tab_layout.xml   |   7 +-
 .../lumen/res/layout/deckview_tab_layout.xml  |  10 +-
 .../browser/lightning/utils/ThemeUtils.java   | 103 ------------------
 .../cliqz/browser/main/CliqzBrowserState.java |   9 ++
 .../com/cliqz/browser/main/TabsManager.java   |  14 +--
 .../browser/main/search/TrashCanView.java     |   6 +-
 .../browser/widget/AutocompleteEditText.java  |   3 +-
 .../cliqz/browser/widget/OverFlowMenu.java    |   2 +-
 .../com/cliqz/browser/widget/TabsCounter.kt   |   4 +-
 .../cliqz/deckview/TabsDeckViewAdapter.java   |  27 +++--
 .../java/com/cliqz/deckview/ViewHolder.java   |  18 ++-
 .../com/cliqz/widget/CliqzImageButton.java    |  55 ++++++++++
 .../java/com/cliqz/widget/CliqzImageView.java |  55 ++++++++++
 .../java/com/cliqz/widget/CliqzTextView.java  |   1 -
 gradle.properties                             |   2 +-
 24 files changed, 227 insertions(+), 161 deletions(-)
 create mode 100644 app/src/cliqz/res/drawable/tab_default_favicon.xml
 create mode 100644 app/src/lumen/res/drawable/ic_tab_close.xml
 create mode 100644 app/src/lumen/res/drawable/tab_default_favicon.xml
 create mode 100644 app/src/lumen/res/drawable/tabs_title_color.xml
 delete mode 100644 app/src/main/java/acr/browser/lightning/utils/ThemeUtils.java
 create mode 100644 app/src/main/java/com/cliqz/widget/CliqzImageButton.java
 create mode 100644 app/src/main/java/com/cliqz/widget/CliqzImageView.java

diff --git a/android_utils/src/main/java/com/cliqz/utils/SpannableUtils.java b/android_utils/src/main/java/com/cliqz/utils/SpannableUtils.java
index 50c308992..2b515f8a1 100644
--- a/android_utils/src/main/java/com/cliqz/utils/SpannableUtils.java
+++ b/android_utils/src/main/java/com/cliqz/utils/SpannableUtils.java
@@ -3,9 +3,6 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
-import androidx.annotation.NonNull;
-import androidx.annotation.StringRes;
-import androidx.core.content.ContextCompat;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
@@ -13,6 +10,10 @@
 import android.text.style.ImageSpan;
 import android.text.style.URLSpan;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.appcompat.content.res.AppCompatResources;
+
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -25,7 +26,7 @@
 public final class SpannableUtils {
 
     private static final Pattern MARKDOWN_PATTERN =
-            Pattern.compile("((!?)\\[(.*?)\\]\\((.*?)\\))|(<br\\s*>)");
+            Pattern.compile("((!?)\\[(.*?)]\\((.*?)\\))|(<br\\s*>)");
 
     private SpannableUtils() {
     } // No instances
@@ -67,7 +68,8 @@ public static Spannable markdownStringToSpannable(@NonNull Context context,
                 if (drawableId == 0) {
                     drawable = null;
                 } else {
-                    drawable = ContextCompat.getDrawable(context, drawableId);
+                    drawable = AppCompatResources.getDrawable(context, drawableId);
+                    assert drawable != null;
                     drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
                 }
                 region = new SpannableRegion(matcher.start(), matcher.end(),
@@ -110,7 +112,7 @@ public static Spannable markdownStringToSpannable(@NonNull Context context,
             prev = region.regionEnd;
         }
         if (prev < in.length()) {
-            builder.append(in.substring(prev, in.length()));
+            builder.append(in.substring(prev));
         }
         return builder;
     }
diff --git a/app/src/cliqz/res/drawable/tab_default_favicon.xml b/app/src/cliqz/res/drawable/tab_default_favicon.xml
new file mode 100644
index 000000000..fd150daba
--- /dev/null
+++ b/app/src/cliqz/res/drawable/tab_default_favicon.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+     android:src="@drawable/ic_webpage" />
\ No newline at end of file
diff --git a/app/src/cliqz/res/layout-land/deckview_tab_layout.xml b/app/src/cliqz/res/layout-land/deckview_tab_layout.xml
index c3bcab45e..06381701b 100644
--- a/app/src/cliqz/res/layout-land/deckview_tab_layout.xml
+++ b/app/src/cliqz/res/layout-land/deckview_tab_layout.xml
@@ -8,7 +8,7 @@
     android:layout_height="match_parent"
     android:background="@drawable/deckview_tab_background">
 
-    <ImageButton
+    <com.cliqz.widget.CliqzImageButton
         android:id="@+id/closeBtn"
         style="@style/Widget.AppCompat.ImageButton"
         android:layout_width="30dp"
@@ -17,14 +17,16 @@
         android:layout_marginTop="8dp"
         android:background="@null"
         app:srcCompat="@drawable/ic_clear_black"
+        tools:src="@drawable/ic_clear_black"
         tools:ignore="ContentDescription" />
 
-    <ImageView
+    <com.cliqz.widget.CliqzImageView
         android:id="@+id/favIconImg"
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:layout_marginStart="46dp"
         app:srcCompat="@android:drawable/ic_media_play"
+        tools:src="@android:drawable/ic_media_play"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="0dp"
         tools:ignore="ContentDescription" />
diff --git a/app/src/cliqz/res/layout/deckview_tab_layout.xml b/app/src/cliqz/res/layout/deckview_tab_layout.xml
index fc386342d..34e66268c 100644
--- a/app/src/cliqz/res/layout/deckview_tab_layout.xml
+++ b/app/src/cliqz/res/layout/deckview_tab_layout.xml
@@ -7,26 +7,26 @@
     android:layout_height="match_parent"
     android:background="@drawable/deckview_tab_background">
 
-    <ImageView
+    <com.cliqz.widget.CliqzImageView
         android:id="@+id/favIconImg"
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_marginStart="8dp"
         app:srcCompat="@android:drawable/ic_media_play"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@android:drawable/ic_media_play"
         android:layout_marginTop="8dp" />
 
-    <ImageButton
+    <com.cliqz.widget.CliqzImageButton
         android:id="@+id/closeBtn"
         style="@style/Widget.AppCompat.ImageButton"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginEnd="8dp"
         android:background="@null"
         android:layout_marginTop="8dp"
-        android:layout_gravity="right"
-        app:srcCompat="@drawable/ic_clear_black" />
+        android:layout_gravity="end"
+        app:srcCompat="@drawable/ic_clear_black"
+        tools:src="@drawable/ic_clear_black"/>
 
     <com.cliqz.widget.CliqzTextView
         android:id="@+id/titleTv"
diff --git a/app/src/lumen/java/com/cliqz/browser/extensions/DrawableExtensions.kt b/app/src/lumen/java/com/cliqz/browser/extensions/DrawableExtensions.kt
index 6d64402ee..0ff3c16ed 100644
--- a/app/src/lumen/java/com/cliqz/browser/extensions/DrawableExtensions.kt
+++ b/app/src/lumen/java/com/cliqz/browser/extensions/DrawableExtensions.kt
@@ -8,16 +8,17 @@ import android.widget.TextView
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 
 fun TextView.drawableStart(@DrawableRes id: Int) {
-    val drawable = ContextCompat.getDrawable(context, id)
+    val drawable = AppCompatResources.getDrawable(context, id)
     setCompoundDrawablesWithIntrinsicBounds(drawable, null, null,  null)
 }
 
 fun ImageView.setDrawable(@DrawableRes id: Int) {
-    setImageDrawable(ContextCompat.getDrawable(context, id))
+    setImageDrawable(AppCompatResources.getDrawable(context, id))
 }
 
 @ColorInt fun Context.getColorCompat(@ColorRes id: Int): Int {
diff --git a/app/src/lumen/java/com/cliqz/browser/overview/OverviewFragment.java b/app/src/lumen/java/com/cliqz/browser/overview/OverviewFragment.java
index 1342f37c3..69b5bed75 100644
--- a/app/src/lumen/java/com/cliqz/browser/overview/OverviewFragment.java
+++ b/app/src/lumen/java/com/cliqz/browser/overview/OverviewFragment.java
@@ -14,6 +14,7 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
+import com.cliqz.browser.BuildConfig;
 import com.cliqz.browser.R;
 import com.cliqz.browser.app.BrowserApp;
 import com.cliqz.browser.main.FlavoredActivityComponent;
@@ -47,12 +48,14 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         final Toolbar toolbar = view.findViewById(R.id.toolbar);
         final AppCompatActivity activity = (AppCompatActivity) getActivity();
         assert activity != null;
-        toolbar.setTitle(activity.getString(R.string.overview));
+        final String title =
+                activity.getString(BuildConfig.IS_LUMEN ? R.string.open_tabs : R.string.overview);
+        toolbar.setTitle(title);
         activity.setSupportActionBar(toolbar);
         final ActionBar actionBar = activity.getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setTitle(activity.getString(R.string.overview));
+            actionBar.setTitle(title);
         }
 
         return view;
diff --git a/app/src/lumen/res/drawable/ic_tab_close.xml b/app/src/lumen/res/drawable/ic_tab_close.xml
new file mode 100644
index 000000000..63f1c0e15
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_tab_close.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item app:state_incognito="true" android:drawable="@drawable/ic_clear" />
+    <item android:drawable="@drawable/ic_clear_black" />
+</selector>
\ No newline at end of file
diff --git a/app/src/lumen/res/drawable/tab_default_favicon.xml b/app/src/lumen/res/drawable/tab_default_favicon.xml
new file mode 100644
index 000000000..7045f959e
--- /dev/null
+++ b/app/src/lumen/res/drawable/tab_default_favicon.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item app:state_incognito="true">
+        <bitmap android:src="@drawable/ic_webpage" android:tint="@color/white" />
+    </item>
+    <item>
+        <bitmap android:src="@drawable/ic_webpage" />
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/lumen/res/drawable/tabs_title_color.xml b/app/src/lumen/res/drawable/tabs_title_color.xml
new file mode 100644
index 000000000..981ef1357
--- /dev/null
+++ b/app/src/lumen/res/drawable/tabs_title_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item app:state_incognito="true" android:color="@color/white" />
+    <item android:color="@color/black" />
+</selector>
\ No newline at end of file
diff --git a/app/src/lumen/res/layout-land/deckview_tab_layout.xml b/app/src/lumen/res/layout-land/deckview_tab_layout.xml
index f58ef3ddb..7fdb3f45e 100644
--- a/app/src/lumen/res/layout-land/deckview_tab_layout.xml
+++ b/app/src/lumen/res/layout-land/deckview_tab_layout.xml
@@ -18,12 +18,11 @@
         android:lines="1"
         android:singleLine="true"
         android:textSize="15sp"
-        android:textColor="@color/black"
-        android:textStyle="bold"
+        android:textColor="@drawable/tabs_title_color"
         android:background="@drawable/tabs_overview_header_gradient"
         tools:text="A possibly very very very long title" />
 
-    <ImageView
+    <com.cliqz.widget.CliqzImageView
         android:id="@+id/favIconImg"
         android:layout_width="30dp"
         android:layout_height="30dp"
@@ -32,7 +31,7 @@
         tools:srcCompat="@android:drawable/ic_media_play"
         tools:background="#6D6" />
 
-    <ImageButton
+    <com.cliqz.widget.CliqzImageButton
         android:id="@+id/closeBtn"
         style="@style/Widget.AppCompat.ImageButton"
         android:layout_width="30dp"
diff --git a/app/src/lumen/res/layout/deckview_tab_layout.xml b/app/src/lumen/res/layout/deckview_tab_layout.xml
index 97a35cb87..dedf33003 100644
--- a/app/src/lumen/res/layout/deckview_tab_layout.xml
+++ b/app/src/lumen/res/layout/deckview_tab_layout.xml
@@ -18,28 +18,26 @@
         android:lines="1"
         android:singleLine="true"
         android:textSize="15sp"
-        android:textColor="@color/black"
-        android:textStyle="bold"
+        android:textColor="@drawable/tabs_title_color"
         android:background="@drawable/tabs_overview_header_gradient"
         tools:text="A possibly very very very long title" />
 
-    <ImageView
+    <com.cliqz.widget.CliqzImageView
         android:id="@+id/favIconImg"
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="10dp"
-        tools:srcCompat="@android:drawable/ic_media_play"
         tools:background="#6D6" />
 
-    <ImageButton
+    <com.cliqz.widget.CliqzImageButton
         android:id="@+id/closeBtn"
         style="@style/Widget.AppCompat.ImageButton"
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_gravity="end"
         android:background="@null"
-        app:srcCompat="@drawable/ic_clear_black" />
+        app:srcCompat="@drawable/ic_tab_close" />
 
     <!-- Keeping this View just for Cliqz Browser compability -->
     <TextView
diff --git a/app/src/main/java/acr/browser/lightning/utils/ThemeUtils.java b/app/src/main/java/acr/browser/lightning/utils/ThemeUtils.java
deleted file mode 100644
index 4ce5b4130..000000000
--- a/app/src/main/java/acr/browser/lightning/utils/ThemeUtils.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package acr.browser.lightning.utils;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import androidx.annotation.AttrRes;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import android.util.TypedValue;
-import android.widget.ImageView;
-
-import com.cliqz.browser.R;
-
-public class ThemeUtils {
-
-    private static final TypedValue sTypedValue = new TypedValue();
-
-    public static int getPrimaryColor(@NonNull Context context) {
-        return getColor(context, R.attr.colorPrimary);
-    }
-
-    public static int getPrimaryColorDark(@NonNull Context context) {
-        return getColor(context, R.attr.colorPrimaryDark);
-    }
-
-    public static int getAccentColor(@NonNull Context context) {
-        return getColor(context, R.attr.colorAccent);
-    }
-
-    private static int getColor(@NonNull Context context, @AttrRes int resource) {
-        TypedArray a = context.obtainStyledAttributes(sTypedValue.data, new int[]{resource});
-        int color = a.getColor(0, 0);
-        a.recycle();
-        return color;
-    }
-
-    public static int getIconLightThemeColor(@NonNull Context context) {
-        return ContextCompat.getColor(context, R.color.icon_light_theme);
-    }
-
-    public static int getIconDarkThemeColor(@NonNull Context context) {
-        return ContextCompat.getColor(context, R.color.icon_dark_theme);
-    }
-
-    public static void themeImageView(ImageView icon, Context context, boolean dark) {
-        int color = dark ? getIconDarkThemeColor(context) : getIconLightThemeColor(context);
-        icon.setColorFilter(color, PorterDuff.Mode.SRC_IN);
-    }
-
-    public static Bitmap getThemedBitmap(Context context, @DrawableRes int res, boolean dark) {
-        int color = dark ? getIconDarkThemeColor(context) : getIconLightThemeColor(context);
-        Bitmap sourceBitmap = BitmapFactory.decodeResource(context.getResources(), res);
-        Bitmap resultBitmap = Bitmap.createBitmap(sourceBitmap.getWidth(), sourceBitmap.getHeight(), Bitmap.Config.ARGB_8888);
-        Paint p = new Paint();
-        ColorFilter filter = new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN);
-        p.setColorFilter(filter);
-        Canvas canvas = new Canvas(resultBitmap);
-        canvas.drawBitmap(sourceBitmap, 0, 0, p);
-        sourceBitmap.recycle();
-        return resultBitmap;
-    }
-
-    @Nullable
-    public static Drawable getThemedDrawable(@NonNull Context context, @DrawableRes int res, boolean dark) {
-        int color = dark ? getIconDarkThemeColor(context) : getIconLightThemeColor(context);
-        final Drawable drawable = ContextCompat.getDrawable(context, res);
-        if (drawable == null)
-            return null;
-        drawable.mutate();
-        drawable.setColorFilter(color, PorterDuff.Mode.SRC_IN);
-        return drawable;
-    }
-
-    @Nullable
-    public static Drawable getLightThemedDrawable(@NonNull Context context, @DrawableRes int res) {
-        final Drawable drawable = ContextCompat.getDrawable(context, res);
-        if (drawable == null)
-            return null;
-        drawable.mutate();
-        drawable.setColorFilter(getIconLightThemeColor(context), PorterDuff.Mode.SRC_IN);
-        return drawable;
-    }
-
-    public static ColorDrawable getSelectedBackground(@NonNull Context context, boolean dark) {
-        final int color = (dark) ? ContextCompat.getColor(context, R.color.selected_dark) :
-                ContextCompat.getColor(context, R.color.selected_light);
-        return new ColorDrawable(color);
-    }
-
-    public static int getTextColor(Context context) {
-        return getColor(context, android.R.attr.editTextColor);
-    }
-}
diff --git a/app/src/main/java/com/cliqz/browser/main/CliqzBrowserState.java b/app/src/main/java/com/cliqz/browser/main/CliqzBrowserState.java
index bf8d784f1..f2418d713 100644
--- a/app/src/main/java/com/cliqz/browser/main/CliqzBrowserState.java
+++ b/app/src/main/java/com/cliqz/browser/main/CliqzBrowserState.java
@@ -22,6 +22,7 @@ public enum Mode {
     private Mode mode = Mode.SEARCH;
     private boolean incognito;
     private Bitmap favicon = null;
+    private boolean selected = false;
 
     public String getQuery() {
         return query;
@@ -71,6 +72,14 @@ public Bitmap getFavIcon() {
         return favicon;
     }
 
+    void setSelected(boolean selected) {
+        this.selected = selected;
+    }
+
+    public boolean isSelected() {
+        return selected;
+    }
+
     public CliqzBrowserState() {
     }
 }
diff --git a/app/src/main/java/com/cliqz/browser/main/TabsManager.java b/app/src/main/java/com/cliqz/browser/main/TabsManager.java
index 57be73698..28a95dfe4 100644
--- a/app/src/main/java/com/cliqz/browser/main/TabsManager.java
+++ b/app/src/main/java/com/cliqz/browser/main/TabsManager.java
@@ -193,12 +193,7 @@ public TabFragment getTab(int position) {
      * @param position Position of the tab to switch to
      */
     public void showTab(int position) {
-        final TabFragment tab = mFragmentsList.get(position);
-        mFragmentManager.beginTransaction()
-                .replace(R.id.content_frame, tab, MainActivity.TAB_FRAGMENT_TAG)
-                .commitAllowingStateLoss();
-        currentVisibleTab = position;
-        persister.visit(tab.getTabId());
+        showTab(position, 0);
     }
 
     /**
@@ -208,9 +203,14 @@ public void showTab(int position) {
      * @param animation Animation for the enter transition
      */
     public void showTab(int position, int animation) {
+        final TabFragment currentTab = getCurrentTab();
+        if (currentTab != null) {
+            currentTab.state.setSelected(false);
+        }
         final TabFragment tab = mFragmentsList.get(position);
+        tab.state.setSelected(true);
         final FragmentTransaction transaction = mFragmentManager.beginTransaction();
-        if (Build.VERSION.SDK_INT != Build.VERSION_CODES.M) {
+        if (Build.VERSION.SDK_INT != Build.VERSION_CODES.M && animation != 0) {
             //cannot pass null for exit animation
             transaction.setCustomAnimations(animation, R.anim.dummy_transition);
         }
diff --git a/app/src/main/java/com/cliqz/browser/main/search/TrashCanView.java b/app/src/main/java/com/cliqz/browser/main/search/TrashCanView.java
index 436a975f3..ac5e163f7 100644
--- a/app/src/main/java/com/cliqz/browser/main/search/TrashCanView.java
+++ b/app/src/main/java/com/cliqz/browser/main/search/TrashCanView.java
@@ -5,9 +5,11 @@
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.AppCompatTextView;
+import androidx.core.content.ContextCompat;
 
 import com.cliqz.browser.R;
 
@@ -24,7 +26,7 @@ class TrashCanView extends AppCompatTextView {
     public TrashCanView(Context context) {
         super(context);
         defaultTint = ContextCompat.getColor(context, R.color.white);
-        drawable = ContextCompat.getDrawable(context,R.drawable.ic_delete);
+        drawable = AppCompatResources.getDrawable(context,R.drawable.ic_delete);
         if (drawable == null) {
             throw new RuntimeException("Null drawable");
         }
diff --git a/app/src/main/java/com/cliqz/browser/widget/AutocompleteEditText.java b/app/src/main/java/com/cliqz/browser/widget/AutocompleteEditText.java
index 69757ce7d..ed05523cd 100644
--- a/app/src/main/java/com/cliqz/browser/widget/AutocompleteEditText.java
+++ b/app/src/main/java/com/cliqz/browser/widget/AutocompleteEditText.java
@@ -18,6 +18,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.AppCompatEditText;
 import androidx.core.content.ContextCompat;
 import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
@@ -125,7 +126,7 @@ private void setSelectHandDrawable() {
     }
 
     private Drawable setDrawableColorFilter(int drawableId){
-        final Drawable drawable =  ContextCompat.getDrawable(getContext(),drawableId);
+        final Drawable drawable =  AppCompatResources.getDrawable(getContext(),drawableId);
         if (drawable != null) {
             drawable.setColorFilter(ContextCompat.getColor(getContext(), R.color.primary_color), PorterDuff.Mode.SRC_ATOP);
         }
diff --git a/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java b/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java
index aa4a713dc..f91a8b344 100644
--- a/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java
+++ b/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java
@@ -235,7 +235,7 @@ public OverFlowMenu(Activity activity) {
         overFlowMenuAdapter = new OverFlowMenuAdapter();
         listView.setAdapter(overFlowMenuAdapter);
         listView.setOnItemClickListener(new MenuItemClickListener());
-        final Drawable drawable = ContextCompat.getDrawable(activity, android.R.drawable.dialog_holo_light_frame);
+        final Drawable drawable = AppCompatResources.getDrawable(activity, android.R.drawable.dialog_holo_light_frame);
         listView.setBackground(drawable);
         listView.setDivider(null);
     }
diff --git a/app/src/main/java/com/cliqz/browser/widget/TabsCounter.kt b/app/src/main/java/com/cliqz/browser/widget/TabsCounter.kt
index dffdaa380..c8592c319 100644
--- a/app/src/main/java/com/cliqz/browser/widget/TabsCounter.kt
+++ b/app/src/main/java/com/cliqz/browser/widget/TabsCounter.kt
@@ -6,7 +6,7 @@ import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.view.View
 import androidx.annotation.ColorInt
-import androidx.core.content.ContextCompat
+import androidx.appcompat.content.res.AppCompatResources
 import com.cliqz.browser.R
 import kotlin.math.min
 
@@ -14,7 +14,7 @@ class TabsCounter @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : View(context, attrs, defStyleAttr) {
 
-    private val counterBackground: Drawable = ContextCompat.getDrawable(context, R.drawable.tab_counter)!!
+    private val counterBackground: Drawable = AppCompatResources.getDrawable(context, R.drawable.tab_counter)!!
     private val counterBounds = Rect()
     private val textBounds = Rect()
     private val paint = Paint(Paint.ANTI_ALIAS_FLAG or Paint.FAKE_BOLD_TEXT_FLAG)
diff --git a/app/src/main/java/com/cliqz/deckview/TabsDeckViewAdapter.java b/app/src/main/java/com/cliqz/deckview/TabsDeckViewAdapter.java
index b3524f96f..268908552 100644
--- a/app/src/main/java/com/cliqz/deckview/TabsDeckViewAdapter.java
+++ b/app/src/main/java/com/cliqz/deckview/TabsDeckViewAdapter.java
@@ -2,17 +2,18 @@
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
+import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 
 import com.cliqz.browser.BuildConfig;
 import com.cliqz.browser.R;
@@ -41,16 +42,13 @@ class TabsDeckViewAdapter extends RecyclerView.Adapter<ViewHolder> {
     private final Drawable tabDefaultIcon;
     private final Context context;
     private static final String GET_LOGO_FUNCTION = "getLogoDetails";
-    private final Bitmap defaultFavicon;
     private final int defaultBackgroundColor;
 
     TabsDeckViewAdapter(TabsDeckView tabsDeckView) {
         this.tabsDeckView = tabsDeckView;
         this.context = tabsDeckView.getContext();
         this.inflater = LayoutInflater.from(context);
-        this.tabDefaultIcon = ContextCompat.getDrawable(context, R.drawable.logo_start_tab);
-        this.defaultFavicon = BitmapFactory
-                .decodeResource(context.getResources(), R.drawable.ic_webpage);
+        this.tabDefaultIcon = AppCompatResources.getDrawable(context, R.drawable.logo_start_tab);
         this.defaultBackgroundColor = BuildConfig.IS_LUMEN ?
                 ContextCompat.getColor(context, R.color.secondary_color) :
                 ContextCompat.getColor(context, R.color.accent_color);
@@ -67,8 +65,7 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
             card.setId(R.id.regular_tab_id);
         }
         final ViewHolder viewHolder = new ViewHolder(tabsDeckView, card);
-        viewHolder.titleTv.setIncognito(viewType == INCOGNITO_TYPE);
-        viewHolder.rootView.setIncognito(viewType == INCOGNITO_TYPE);
+        viewHolder.setIncognito(viewType == INCOGNITO_TYPE);
         return viewHolder;
     }
 
@@ -88,10 +85,16 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
             title = context.getString(R.string.home_title);
         }
         holder.urlTv.setText(url);
+        final Typeface typeface = holder.titleTv.getTypeface();
+        if (BuildConfig.IS_LUMEN && entry.isSelected()) {
+            holder.titleTv.setTypeface(null, Typeface.BOLD);
+        } else {
+            holder.titleTv.setTypeface(null, Typeface.NORMAL);
+        }
         holder.titleTv.setText(title);
 
         if (mode != Mode.WEBPAGE || entry.getFavIcon() == null) {
-            holder.favIconIV.setImageBitmap(defaultFavicon);
+            holder.favIconIV.setImageResource(R.drawable.tab_default_favicon);
         } else {
             holder.favIconIV.setImageBitmap(entry.getFavIcon());
         }
diff --git a/app/src/main/java/com/cliqz/deckview/ViewHolder.java b/app/src/main/java/com/cliqz/deckview/ViewHolder.java
index f29d94c27..5237386e6 100644
--- a/app/src/main/java/com/cliqz/deckview/ViewHolder.java
+++ b/app/src/main/java/com/cliqz/deckview/ViewHolder.java
@@ -8,6 +8,8 @@
 
 import com.cliqz.browser.R;
 import com.cliqz.widget.CliqzFrameLayout;
+import com.cliqz.widget.CliqzImageButton;
+import com.cliqz.widget.CliqzImageView;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.cliqz.widget.CliqzTextView;
 
@@ -19,10 +21,12 @@ class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener
     final TextView urlTv;
     final View backgroundView;
     final CliqzFrameLayout rootView;
-    final ImageView favIconIV;
+    final CliqzImageView favIconIV;
     final SimpleDraweeView bigIconIV;
+    final CliqzImageButton closeButton;
 
     private final TabsDeckView tabsDeckView;
+    private boolean mIsIcongnito = false;
 
     ViewHolder(TabsDeckView tabsDeckView, View itemView) {
         super(itemView);
@@ -32,7 +36,7 @@ class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener
         rootView = (CliqzFrameLayout) itemView;
         favIconIV = itemView.findViewById(R.id.favIconImg);
         bigIconIV = itemView.findViewById(R.id.bigIconImg);
-        final ImageButton closeButton = itemView.findViewById(R.id.closeBtn);
+        closeButton = itemView.findViewById(R.id.closeBtn);
         this.tabsDeckView = tabsDeckView;
 
         closeButton.setOnClickListener(this);
@@ -55,4 +59,14 @@ public void onClick(View view) {
                 break;
         }
     }
+
+    public void setIncognito(boolean value) {
+        if (value != mIsIcongnito) {
+            mIsIcongnito = value;
+            rootView.setIncognito(value);
+            closeButton.setIncognito(value);
+            titleTv.setIncognito(value);
+            favIconIV.setIncognito(value);
+        }
+    }
 }
diff --git a/app/src/main/java/com/cliqz/widget/CliqzImageButton.java b/app/src/main/java/com/cliqz/widget/CliqzImageButton.java
new file mode 100644
index 000000000..0c244aaa4
--- /dev/null
+++ b/app/src/main/java/com/cliqz/widget/CliqzImageButton.java
@@ -0,0 +1,55 @@
+/**
+ * Generated source file do not edit
+ */
+package com.cliqz.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.cliqz.browser.R;
+
+public class CliqzImageButton extends androidx.appcompat.widget.AppCompatImageButton {
+
+    private static final int[] STATE_INCOGNITO = {R.attr.state_incognito};
+
+    private boolean mIsIncognito = false;
+
+    public CliqzImageButton(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public CliqzImageButton(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public CliqzImageButton(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public int[] onCreateDrawableState(int extraSpace) {
+        if (mIsIncognito) {
+            // We are going to add 1 extra state.
+            final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+            mergeDrawableStates(drawableState, STATE_INCOGNITO);
+            return drawableState;
+        } else {
+            return super.onCreateDrawableState(extraSpace);
+        }
+    }
+
+    public final void setIncognito(boolean value) {
+        if (mIsIncognito != value) {
+            mIsIncognito = value;
+            refreshDrawableState();
+        }
+    }
+
+    public final boolean isIncognito() {
+        return mIsIncognito;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cliqz/widget/CliqzImageView.java b/app/src/main/java/com/cliqz/widget/CliqzImageView.java
new file mode 100644
index 000000000..70c73216c
--- /dev/null
+++ b/app/src/main/java/com/cliqz/widget/CliqzImageView.java
@@ -0,0 +1,55 @@
+/**
+ * Generated source file do not edit
+ */
+package com.cliqz.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.cliqz.browser.R;
+
+public class CliqzImageView extends androidx.appcompat.widget.AppCompatImageView {
+
+    private static final int[] STATE_INCOGNITO = {R.attr.state_incognito};
+
+    private boolean mIsIncognito = false;
+
+    public CliqzImageView(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public CliqzImageView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public CliqzImageView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public int[] onCreateDrawableState(int extraSpace) {
+        if (mIsIncognito) {
+            // We are going to add 1 extra state.
+            final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+
+            mergeDrawableStates(drawableState, STATE_INCOGNITO);
+            return drawableState;
+        } else {
+            return super.onCreateDrawableState(extraSpace);
+        }
+    }
+
+    public final void setIncognito(boolean value) {
+        if (mIsIncognito != value) {
+            mIsIncognito = value;
+            refreshDrawableState();
+        }
+    }
+
+    public final boolean isIncognito() {
+        return mIsIncognito;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cliqz/widget/CliqzTextView.java b/app/src/main/java/com/cliqz/widget/CliqzTextView.java
index a8e004d67..2fc2bfa5e 100644
--- a/app/src/main/java/com/cliqz/widget/CliqzTextView.java
+++ b/app/src/main/java/com/cliqz/widget/CliqzTextView.java
@@ -42,7 +42,6 @@ protected int[] onCreateDrawableState(int extraSpace) {
         }
     }
 
-
     public final void setIncognito(boolean value) {
         if (mIsIncognito != value) {
             mIsIncognito = value;
diff --git a/gradle.properties b/gradle.properties
index 5387c4a56..9ac3be7a4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 android.builder.sdkDownload=false
 org.gradle.parallel=true
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xms1024m -Xmx4096m
+org.gradle.jvmargs=-Xms1024m -Xmx3072m
 android.useAndroidX=true
 android.enableJetifier=true

From 6188992f027f890119f6090f5b7088ea78939ba1 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Mon, 15 Jul 2019 13:59:05 +0200
Subject: [PATCH 32/57] AP-433 solves an animation bug that uncorreclty show
 the search view (#161)

---
 app/src/lumen/res/layout/search_bar_widget.xml            | 1 +
 app/src/main/java/com/cliqz/browser/widget/SearchBar.java | 4 +++-
 build.gradle                                              | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/lumen/res/layout/search_bar_widget.xml b/app/src/lumen/res/layout/search_bar_widget.xml
index d88477679..b7e289d09 100644
--- a/app/src/lumen/res/layout/search_bar_widget.xml
+++ b/app/src/lumen/res/layout/search_bar_widget.xml
@@ -19,6 +19,7 @@
 
     <TextView
         android:id="@+id/title_bar"
+        android:focusable="true"
         android:layout_width="0dp"
         android:layout_weight="1"
         android:layout_height="@dimen/title_bar_h"
diff --git a/app/src/main/java/com/cliqz/browser/widget/SearchBar.java b/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
index d3c5a5531..57efce266 100644
--- a/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
+++ b/app/src/main/java/com/cliqz/browser/widget/SearchBar.java
@@ -226,7 +226,9 @@ public void showTitleBar() {
         animation.setAnimationListener(new Animation.AnimationListener() {
             @Override
             public void onAnimationStart(Animation animation) {
-                searchEditText.clearFocus();
+                // We can't searchEditText.clearFocus() because it first requests focus bringing
+                // the SearchView to front.
+                titleBar.requestFocus();
             }
 
             @Override
diff --git a/build.gradle b/build.gradle
index d523d41c3..6e57038fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.6'
         classpath 'com.google.gms:google-services:4.2.0'
         classpath 'com.github.cliqz-oss:minibloomfilter:1.0'

From f9eddcfed1da0d1c30c5c182b84f81357b171d39 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Mon, 15 Jul 2019 15:12:52 +0200
Subject: [PATCH 33/57] AP-359 Start tab design fixes (#148)

---
 .../cliqz/res/layout/favorite_viewholder.xml  |  56 +++++++++
 .../cliqz/res/layout/history_viewholder.xml   |  66 +++++++++++
 .../browser/starttab/StartTabAdapter.java     |   4 +-
 .../drawable-xxhdpi/lumen_logo_start_tab.png  | Bin 0 -> 91280 bytes
 .../lumen/res/drawable/ic_favorite_tab.xml    |  13 +++
 app/src/lumen/res/drawable/ic_fresh_tab.xml   |  72 +++++++++++-
 app/src/lumen/res/drawable/ic_history_tab.xml |  27 +++++
 .../lumen/res/drawable/ic_history_white.xml   |   5 -
 .../drawable/lumen_tab_layout_background.xml  |  14 +++
 .../lumen/res/layout/favorite_viewholder.xml  |  63 +++++++++++
 .../lumen/res/layout/fragment_favorite.xml    |   1 +
 .../lumen/res/layout/fragment_freshtab.xml    |   2 +-
 .../fragment_freshtab_trial_over_msg.xml      |  32 +++---
 .../fragment_freshtab_trial_upgrade_msg.xml   |  21 ++--
 .../layout/fragment_freshtab_welcome_msg.xml  |  11 +-
 app/src/lumen/res/layout/fragment_history.xml |   1 +
 .../lumen/res/layout/history_list_date.xml    |  27 ++---
 .../lumen/res/layout/history_viewholder.xml   | 107 ++++++++----------
 .../res/layout/starttab_container_layout.xml  |   8 +-
 app/src/lumen/res/values/colors.xml           |   4 +-
 app/src/lumen/res/values/dimens.xml           |   3 +-
 app/src/lumen/res/values/strings.xml          |   2 +-
 .../cliqz/browser/main/FavoritesAdapter.java  |  27 +----
 .../main/res/layout/history_viewholder.xml    |  79 -------------
 build.gradle                                  |   2 +-
 25 files changed, 424 insertions(+), 223 deletions(-)
 create mode 100644 app/src/cliqz/res/layout/favorite_viewholder.xml
 create mode 100644 app/src/cliqz/res/layout/history_viewholder.xml
 create mode 100644 app/src/lumen/res/drawable-xxhdpi/lumen_logo_start_tab.png
 create mode 100644 app/src/lumen/res/drawable/ic_favorite_tab.xml
 create mode 100644 app/src/lumen/res/drawable/ic_history_tab.xml
 delete mode 100644 app/src/lumen/res/drawable/ic_history_white.xml
 create mode 100644 app/src/lumen/res/drawable/lumen_tab_layout_background.xml
 create mode 100644 app/src/lumen/res/layout/favorite_viewholder.xml
 delete mode 100644 app/src/main/res/layout/history_viewholder.xml

diff --git a/app/src/cliqz/res/layout/favorite_viewholder.xml b/app/src/cliqz/res/layout/favorite_viewholder.xml
new file mode 100644
index 000000000..944be4787
--- /dev/null
+++ b/app/src/cliqz/res/layout/favorite_viewholder.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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/history_view_parent"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/history_item_bg"
+    tools:backgroundTint="#FFE8AE"
+    android:layout_marginBottom="5dp"
+    android:layout_marginTop="5dp"
+    android:layout_marginStart="20dp"
+    android:layout_marginEnd="20dp">
+
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@+id/icon_view"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:layout_marginStart="10dp"
+        app:actualImageScaleType="fitXY"
+        tools:background="@color/gray_dark"/>
+
+    <TextView
+        android:id="@+id/history_url"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/primary_color"
+        android:textSize="12sp"
+        android:layout_marginStart="55dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="10dp"
+        android:ellipsize="end"
+        tools:text="www.facebook.com" />
+
+    <TextView
+        android:id="@+id/history_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxLines="3"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        android:layout_marginTop="40dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginBottom="10dp"
+        android:ellipsize="end"
+        tools:text="Facebook - Login or Sign up"/>
+
+    <View
+        android:id="@+id/selectedOverLay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="2dp" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/cliqz/res/layout/history_viewholder.xml b/app/src/cliqz/res/layout/history_viewholder.xml
new file mode 100644
index 000000000..a7b54774c
--- /dev/null
+++ b/app/src/cliqz/res/layout/history_viewholder.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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/history_view_parent"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/history_item_bg"
+    tools:backgroundTint="#FFE8AE"
+    android:layout_marginBottom="5dp"
+    android:layout_marginTop="5dp"
+    android:layout_marginStart="20dp"
+    android:layout_marginEnd="20dp">
+
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@+id/icon_view"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:layout_marginStart="10dp"
+        app:actualImageScaleType="fitXY"
+        tools:background="@color/gray_dark"/>
+
+    <TextView
+        android:id="@+id/history_url"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/primary_color"
+        android:textSize="12sp"
+        android:layout_marginStart="55dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="10dp"
+        android:ellipsize="end"
+        tools:text="www.facebook.com" />
+
+    <TextView
+        android:id="@+id/history_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxLines="3"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        android:layout_marginTop="40dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginBottom="36dp"
+        android:ellipsize="end"
+        tools:text="Facebook - Login or Sign up and other stuff to fill the first line."/>
+
+    <TextView
+        android:id="@+id/history_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:textColor="@color/secondary_color"
+        android:textSize="12sp"
+        android:layout_gravity="bottom|right"
+        tools:text="23:54"/>
+
+    <View
+        android:id="@+id/selectedOverLay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="2dp" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/starttab/StartTabAdapter.java b/app/src/lumen/java/com/cliqz/browser/starttab/StartTabAdapter.java
index c6af8d5da..b65c12d21 100644
--- a/app/src/lumen/java/com/cliqz/browser/starttab/StartTabAdapter.java
+++ b/app/src/lumen/java/com/cliqz/browser/starttab/StartTabAdapter.java
@@ -17,8 +17,8 @@ public class StartTabAdapter extends IconTabLayout.ImagePagerAdapter {
     private final View[] views;
     private final int[] icons = new int[] {
             R.drawable.ic_fresh_tab,
-            R.drawable.ic_history_white,
-            R.drawable.ic_star_white
+            R.drawable.ic_history_tab,
+            R.drawable.ic_favorite_tab
     };
     StartTabAdapter(@NonNull Context context) {
         views = new View[] {
diff --git a/app/src/lumen/res/drawable-xxhdpi/lumen_logo_start_tab.png b/app/src/lumen/res/drawable-xxhdpi/lumen_logo_start_tab.png
new file mode 100644
index 0000000000000000000000000000000000000000..53c2f635f35889597133f8f785dade5947739df0
GIT binary patch
literal 91280
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
Dzk3yS

literal 0
HcmV?d00001

diff --git a/app/src/lumen/res/drawable/ic_favorite_tab.xml b/app/src/lumen/res/drawable/ic_favorite_tab.xml
new file mode 100644
index 000000000..6b9129960
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_favorite_tab.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m11.9986,16.6462 l-4.4553,2.9367c-0.1995,0.1315 -0.4678,0.0764 -0.5993,-0.1231 -0.0686,-0.1041 -0.089,-0.2327 -0.0559,-0.3529l1.4162,-5.1447 -4.1698,-3.3297c-0.1867,-0.1491 -0.2172,-0.4213 -0.0681,-0.608 0.0778,-0.0974 0.1938,-0.1565 0.3183,-0.1622l5.3306,-0.2429 1.8782,-4.9946c0.0841,-0.2236 0.3336,-0.3367 0.5572,-0.2526 0.1167,0.0439 0.2088,0.136 0.2526,0.2526l1.8782,4.9946 5.3306,0.2429c0.2387,0.0109 0.4233,0.2132 0.4125,0.4518 -0.006,0.1245 -0.0648,0.2406 -0.1622,0.3184l-4.1698,3.3297 1.4162,5.1447c0.0634,0.2304 -0.0719,0.4685 -0.3023,0.5319 -0.1202,0.0331 -0.2488,0.0127 -0.3529,-0.0559z"
+      android:strokeWidth="0.97600001"
+      android:fillColor="#00000000"
+      android:strokeColor="#3073db"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/lumen/res/drawable/ic_fresh_tab.xml b/app/src/lumen/res/drawable/ic_fresh_tab.xml
index 373f7752b..f23257b24 100644
--- a/app/src/lumen/res/drawable/ic_fresh_tab.xml
+++ b/app/src/lumen/res/drawable/ic_fresh_tab.xml
@@ -1,5 +1,69 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6.435,5.5989L7.7335,5.5989A0.8,0.8 0,0 1,8.5335 6.3989L8.5335,7.6974A0.8,0.8 0,0 1,7.7335 8.4974L6.435,8.4974A0.8,0.8 0,0 1,5.635 7.6974L5.635,6.3989A0.8,0.8 0,0 1,6.435 5.5989z"
+      android:strokeWidth="0.89600003"
+      android:fillColor="#00000000"
+      android:strokeColor="#1b9cfc"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M6.435,10.5507L7.7335,10.5507A0.8,0.8 0,0 1,8.5335 11.3507L8.5335,12.6493A0.8,0.8 0,0 1,7.7335 13.4493L6.435,13.4493A0.8,0.8 0,0 1,5.635 12.6493L5.635,11.3507A0.8,0.8 0,0 1,6.435 10.5507z"
+      android:strokeWidth="0.89600003"
+      android:fillColor="#00000000"
+      android:strokeColor="#1b9cfc"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M6.435,15.5026L7.7335,15.5026A0.8,0.8 0,0 1,8.5335 16.3026L8.5335,17.6011A0.8,0.8 0,0 1,7.7335 18.4011L6.435,18.4011A0.8,0.8 0,0 1,5.635 17.6011L5.635,16.3026A0.8,0.8 0,0 1,6.435 15.5026z"
+      android:strokeWidth="0.89600003"
+      android:fillColor="#00000000"
+      android:strokeColor="#1b9cfc"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M11.3507,5.5989L12.6493,5.5989A0.8,0.8 0,0 1,13.4493 6.3989L13.4493,7.6974A0.8,0.8 0,0 1,12.6493 8.4974L11.3507,8.4974A0.8,0.8 0,0 1,10.5507 7.6974L10.5507,6.3989A0.8,0.8 0,0 1,11.3507 5.5989z"
+      android:strokeWidth="0.89600003"
+      android:fillColor="#00000000"
+      android:strokeColor="#1b9cfc"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M11.3507,10.5507L12.6493,10.5507A0.8,0.8 0,0 1,13.4493 11.3507L13.4493,12.6493A0.8,0.8 0,0 1,12.6493 13.4493L11.3507,13.4493A0.8,0.8 0,0 1,10.5507 12.6493L10.5507,11.3507A0.8,0.8 0,0 1,11.3507 10.5507z"
+      android:strokeWidth="0.89600003"
+      android:fillColor="#00000000"
+      android:strokeColor="#1b9cfc"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M11.3507,15.5026L12.6493,15.5026A0.8,0.8 0,0 1,13.4493 16.3026L13.4493,17.6011A0.8,0.8 0,0 1,12.6493 18.4011L11.3507,18.4011A0.8,0.8 0,0 1,10.5507 17.6011L10.5507,16.3026A0.8,0.8 0,0 1,11.3507 15.5026z"
+      android:strokeWidth="0.89600003"
+      android:fillColor="#00000000"
+      android:strokeColor="#1b9cfc"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M16.2665,5.5989L17.565,5.5989A0.8,0.8 0,0 1,18.365 6.3989L18.365,7.6974A0.8,0.8 0,0 1,17.565 8.4974L16.2665,8.4974A0.8,0.8 0,0 1,15.4665 7.6974L15.4665,6.3989A0.8,0.8 0,0 1,16.2665 5.5989z"
+      android:strokeWidth="0.89600003"
+      android:fillColor="#00000000"
+      android:strokeColor="#1b9cfc"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M16.2665,10.5507L17.565,10.5507A0.8,0.8 0,0 1,18.365 11.3507L18.365,12.6493A0.8,0.8 0,0 1,17.565 13.4493L16.2665,13.4493A0.8,0.8 0,0 1,15.4665 12.6493L15.4665,11.3507A0.8,0.8 0,0 1,16.2665 10.5507z"
+      android:strokeWidth="0.89600003"
+      android:fillColor="#00000000"
+      android:strokeColor="#1b9cfc"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M16.2665,15.5026L17.565,15.5026A0.8,0.8 0,0 1,18.365 16.3026L18.365,17.6011A0.8,0.8 0,0 1,17.565 18.4011L16.2665,18.4011A0.8,0.8 0,0 1,15.4665 17.6011L15.4665,16.3026A0.8,0.8 0,0 1,16.2665 15.5026z"
+      android:strokeWidth="0.89600003"
+      android:fillColor="#00000000"
+      android:strokeColor="#1b9cfc"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/lumen/res/drawable/ic_history_tab.xml b/app/src/lumen/res/drawable/ic_history_tab.xml
new file mode 100644
index 000000000..f9f9ee8be
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_history_tab.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-7.6,0a7.6,7.6 0,1 1,15.2 0a7.6,7.6 0,1 1,-15.2 0"
+      android:strokeWidth="0.972"
+      android:fillColor="#00000000"
+      android:strokeColor="#3073db"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12.3325,12.2774L12.3325,7.1733"
+      android:strokeWidth="0.972"
+      android:fillColor="#00000000"
+      android:strokeColor="#3073db"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12.3325,12.2774L9.2349,12.2774"
+      android:strokeWidth="0.972"
+      android:fillColor="#00000000"
+      android:strokeColor="#3073db"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/lumen/res/drawable/ic_history_white.xml b/app/src/lumen/res/drawable/ic_history_white.xml
deleted file mode 100644
index de25eb445..000000000
--- a/app/src/lumen/res/drawable/ic_history_white.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
-</vector>
diff --git a/app/src/lumen/res/drawable/lumen_tab_layout_background.xml b/app/src/lumen/res/drawable/lumen_tab_layout_background.xml
new file mode 100644
index 000000000..184cd83ea
--- /dev/null
+++ b/app/src/lumen/res/drawable/lumen_tab_layout_background.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/primary_color" />
+        </shape>
+    </item>
+    <item android:gravity="bottom">
+        <shape android:shape="rectangle">
+            <solid android:color="#3073DB" />
+            <size android:height="1dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/lumen/res/layout/favorite_viewholder.xml b/app/src/lumen/res/layout/favorite_viewholder.xml
new file mode 100644
index 000000000..f2898c78b
--- /dev/null
+++ b/app/src/lumen/res/layout/favorite_viewholder.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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:layout_width="match_parent"
+    android:layout_height="72dp"
+    android:layout_marginStart="16dp"
+    android:layout_marginEnd="16dp"
+    android:layout_marginBottom="16dp"
+    android:background="@color/lumen_history_entry_background">
+
+
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@+id/icon_view"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="16dp"
+        android:layout_gravity="center_vertical"
+        tools:background="@color/black"
+        app:actualImageScaleType="fitXY" />
+
+
+    <LinearLayout
+        android:id="@+id/history_view_parent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="72dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_gravity="center_vertical"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/history_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textColor="@color/text_color_primary"
+            android:textSize="@dimen/title_text_size"
+            tools:text="Facebook - log in or sign up" />
+
+
+        <TextView
+            android:id="@+id/history_url"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/lumen_history_url"
+            android:textSize="@dimen/small_text_size"
+            android:ellipsize="end"
+            tools:text="facebook.com" />
+    </LinearLayout>
+
+    <View
+        android:id="@+id/selectedOverLay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="2dp" />
+
+</FrameLayout>
diff --git a/app/src/lumen/res/layout/fragment_favorite.xml b/app/src/lumen/res/layout/fragment_favorite.xml
index 2ee4d2702..01d30c1e0 100644
--- a/app/src/lumen/res/layout/fragment_favorite.xml
+++ b/app/src/lumen/res/layout/fragment_favorite.xml
@@ -3,5 +3,6 @@
     android:id="@+id/history_rview"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingTop="24dp"
     android:background="@drawable/tab_fragment_background"
     android:paddingBottom="10dp" />
diff --git a/app/src/lumen/res/layout/fragment_freshtab.xml b/app/src/lumen/res/layout/fragment_freshtab.xml
index c2aa1ae53..f1f49a9ad 100644
--- a/app/src/lumen/res/layout/fragment_freshtab.xml
+++ b/app/src/lumen/res/layout/fragment_freshtab.xml
@@ -15,7 +15,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.392" />
+        app:layout_constraintVertical_bias="0.18" />
 
     <include
         android:id="@+id/trial_over_lumen_upgrade"
diff --git a/app/src/lumen/res/layout/fragment_freshtab_trial_over_msg.xml b/app/src/lumen/res/layout/fragment_freshtab_trial_over_msg.xml
index 26f7e4e1d..2108e9f22 100644
--- a/app/src/lumen/res/layout/fragment_freshtab_trial_over_msg.xml
+++ b/app/src/lumen/res/layout/fragment_freshtab_trial_over_msg.xml
@@ -17,8 +17,8 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
         android:text="@string/trial_over_upgrade_lumen_title"
-        android:textColor="@color/text_color_2"
-        android:textSize="@dimen/title_text_size" />
+        android:textColor="#92B6FF"
+        android:textSize="@dimen/normal_text_size" />
 
     <TextView
         android:layout_width="300dp"
@@ -27,31 +27,31 @@
         android:layout_marginBottom="16dp"
         android:text="@string/trial_over_upgrade_lumen_description"
         android:textAlignment="center"
-        android:textColor="@color/text_color_2"
-        android:textSize="@dimen/normal_text_size" />
+        android:textColor="#92B6FF"
+        android:textSize="@dimen/small_text_size" />
 
     <Button
-        android:id="@+id/trial_over_dismiss_btn"
+        android:id="@+id/trial_over_learn_more_btn"
         android:layout_width="200dp"
         android:layout_height="35dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:background="@drawable/rounded_corner_button"
-        android:text="@string/trial_over_upgrade_lumen_dismiss"
-        android:textAllCaps="false"
-        android:textColor="#1B9CFC"
-        android:textSize="@dimen/normal_text_size"
-        android:textStyle="normal" />
+        android:background="@drawable/rounded_corner_solid_button"
+        android:text="@string/trial_over_upgrade_lumen_proceed"
+        android:textColor="@color/white"
+        android:textSize="@dimen/normal_text_size" />
 
     <Button
-        android:id="@+id/trial_over_learn_more_btn"
+        android:id="@+id/trial_over_dismiss_btn"
         android:layout_width="200dp"
         android:layout_height="35dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:background="@drawable/rounded_corner_solid_button"
-        android:text="@string/trial_over_upgrade_lumen_proceed"
+        android:background="@null"
+        android:text="@string/trial_over_upgrade_lumen_dismiss"
+        android:textAllCaps="false"
         android:textColor="@color/white"
-        android:textSize="@dimen/normal_text_size" />
-
+        android:letterSpacing="0.32"
+        android:textSize="@dimen/normal_text_size"
+        android:textStyle="bold" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/lumen/res/layout/fragment_freshtab_trial_upgrade_msg.xml b/app/src/lumen/res/layout/fragment_freshtab_trial_upgrade_msg.xml
index 0e957ad29..0d937d589 100644
--- a/app/src/lumen/res/layout/fragment_freshtab_trial_upgrade_msg.xml
+++ b/app/src/lumen/res/layout/fragment_freshtab_trial_upgrade_msg.xml
@@ -15,20 +15,25 @@
     <!-- tools:showIn="@layout/fragment_freshtab" -->
 
     <TextView
-        android:id="@+id/trial_period_upgrade_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:minHeight="21dp"
+        android:text="@string/upgrade_button"
+        android:letterSpacing="0.35"
         android:textAllCaps="true"
-        android:textColor="@color/accent_color"
-        android:textSize="@dimen/normal_text_size"
-        tools:text="1 more days in the Test-Version" />
+        android:textColor="#1B9CFC"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        tools:targetApi="lollipop" />
 
     <TextView
+        android:id="@+id/trial_period_upgrade_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/upgrade_button"
-        android:textAllCaps="true"
-        android:textColor="#1E97E7"
-        android:textSize="16sp" />
+        android:textColor="#92B6FF "
+        android:letterSpacing="0.1"
+        android:textSize="12sp"
+        tools:text="1 more days in the Test-Version"
+        tools:targetApi="lollipop" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/lumen/res/layout/fragment_freshtab_welcome_msg.xml b/app/src/lumen/res/layout/fragment_freshtab_welcome_msg.xml
index b26e92896..1ca7321cd 100644
--- a/app/src/lumen/res/layout/fragment_freshtab_welcome_msg.xml
+++ b/app/src/lumen/res/layout/fragment_freshtab_welcome_msg.xml
@@ -10,8 +10,8 @@
     tools:ignore="UseCompoundDrawables">
 
     <ImageView
-        android:layout_width="137dp"
-        android:layout_height="137dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:contentDescription="@string/lumen_logo_description"
         app:srcCompat="@drawable/logo_start_tab" />
 
@@ -19,10 +19,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="10dp"
         android:layout_marginEnd="8dp"
         android:text="@string/start_tab_welcome_message"
-        android:textAllCaps="true"
-        android:textColor="@color/white"
-        android:textSize="@dimen/title_text_size" />
+        android:textColor="#516696"
+        android:textSize="14sp" />
 </LinearLayout>
diff --git a/app/src/lumen/res/layout/fragment_history.xml b/app/src/lumen/res/layout/fragment_history.xml
index 2ee4d2702..b66b16b44 100644
--- a/app/src/lumen/res/layout/fragment_history.xml
+++ b/app/src/lumen/res/layout/fragment_history.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/history_rview"
+    android:paddingTop="24dp"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/tab_fragment_background"
diff --git a/app/src/lumen/res/layout/history_list_date.xml b/app/src/lumen/res/layout/history_list_date.xml
index 9ed9b3c84..01a63d221 100644
--- a/app/src/lumen/res/layout/history_list_date.xml
+++ b/app/src/lumen/res/layout/history_list_date.xml
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/history_date"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="10dp"
-    android:layout_marginBottom="5dp"
-    android:gravity="center_horizontal"
-    tools:background="@color/lumen_color_blue_secondary">
+    android:layout_gravity="center"
+    android:layout_marginStart="16dp"
+    android:layout_marginEnd="16dp"
+    android:layout_marginBottom="16dp"
+    android:textColor="@color/text_color_primary"
+    android:textSize="@dimen/small_text_size"
+    tools:text="11-09-2001"
+    tools:background="@color/lumen_color_background"/>
 
-    <TextView
-        android:id="@+id/history_date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="@drawable/rounded_rectangle_bg_white"
-        android:padding="5dp"
-        android:textColor="@color/text_color_primary"
-        tools:text="11-09-2001" />
-
-</FrameLayout>
diff --git a/app/src/lumen/res/layout/history_viewholder.xml b/app/src/lumen/res/layout/history_viewholder.xml
index 390baef63..16dd467e5 100644
--- a/app/src/lumen/res/layout/history_viewholder.xml
+++ b/app/src/lumen/res/layout/history_viewholder.xml
@@ -3,72 +3,65 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center">
+    android:layout_height="72dp"
+    android:layout_marginStart="16dp"
+    android:layout_marginEnd="16dp"
+    android:layout_marginBottom="16dp"
+    android:background="@color/lumen_history_entry_background">
+
+
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@+id/icon_view"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="16dp"
+        android:layout_gravity="center_vertical"
+        tools:background="@color/black"
+        app:actualImageScaleType="fitXY" />
 
-    <LinearLayout
-        android:id="@+id/history_view_parent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginBottom="5dp"
-        android:orientation="vertical"
-        android:background="@drawable/history_item_bg">
 
-        <FrameLayout
+        <LinearLayout
+            android:id="@+id/history_view_parent"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <com.facebook.drawee.view.SimpleDraweeView
-                android:id="@+id/icon_view"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="10dp"
-                android:layout_marginLeft="10dp"
-                tools:background="@color/black"
-                app:actualImageScaleType="fitXY" />
+            android:layout_height="wrap_content"
+            android:layout_marginStart="72dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_gravity="center_vertical"
+            android:orientation="vertical">
 
             <TextView
-                android:id="@+id/history_url"
+                android:id="@+id/history_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="55dp"
-                android:layout_marginLeft="55dp"
-                android:layout_marginEnd="10dp"
-                android:layout_marginRight="10dp"
+                android:maxLines="1"
+                android:ellipsize="end"
                 android:textColor="@color/text_color_primary"
-                android:textSize="12sp"
-                android:layout_gravity="center_vertical"
-                tools:text="facebook.com" />
-        </FrameLayout>
-
-        <TextView
-            android:id="@+id/history_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxLines="3"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:paddingTop="5dp"
-            android:layout_marginRight="10dp"
-            android:layout_marginLeft="10dp"
-            android:paddingBottom="10dp"
-            android:textColor="@color/text_color_primary"
-            android:textSize="16sp"
-            tools:text="Facebook - log in or sign up" />
+                android:textSize="@dimen/title_text_size"
+                tools:text="Facebook - log in or sign up" />
 
-        <TextView
-            android:id="@+id/history_time"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="bottom|right"
-            android:padding="10dp"
-            android:textColor="@color/text_color_primary"
-            android:textSize="12sp"
-            tools:text="12:00" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <TextView
+                    android:id="@+id/history_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:textColor="@color/lumen_history_url"
+                    android:layout_marginEnd="8dp"
+                    android:textSize="@dimen/small_text_size"
+                    tools:text="12:00" />
+                <TextView
+                    android:id="@+id/history_url"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/lumen_history_url"
+                    android:textSize="@dimen/small_text_size"
+                    android:ellipsize="end"
+                    tools:text="facebook.com" />
+            </LinearLayout>
 
     </LinearLayout>
 
diff --git a/app/src/lumen/res/layout/starttab_container_layout.xml b/app/src/lumen/res/layout/starttab_container_layout.xml
index 7de003042..7f7c245ed 100644
--- a/app/src/lumen/res/layout/starttab_container_layout.xml
+++ b/app/src/lumen/res/layout/starttab_container_layout.xml
@@ -3,16 +3,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
 
-    <!-- <com.cliqz.browser.starttab.IconTabLayout -->
     <com.cliqz.browser.starttab.IconTabLayout
         android:id="@+id/tab_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/primary_color"
+        tools:layout_height="32dp"
+        android:background="@drawable/lumen_tab_layout_background"
+        app:tabIndicatorColor="#1B9CFC"
         app:tabTextColor="@color/white"
-        app:tabIconTint="@color/white"/>
+        app:tabIconTint="#1B9CFC"/>
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager"
diff --git a/app/src/lumen/res/values/colors.xml b/app/src/lumen/res/values/colors.xml
index abccfa2b2..7c70abb29 100644
--- a/app/src/lumen/res/values/colors.xml
+++ b/app/src/lumen/res/values/colors.xml
@@ -48,4 +48,6 @@
 
     <color name="tabs_overview_background_color">@color/primary_color</color>
     <color name="tabs_overview_floating_button_color">@color/bond_general_color_blue</color>
-</resources>
\ No newline at end of file
+    <color name="lumen_history_entry_background">#17233D</color>
+    <color name="lumen_history_url">#9EA1A9</color>
+</resources>
diff --git a/app/src/lumen/res/values/dimens.xml b/app/src/lumen/res/values/dimens.xml
index b4fadde6b..d6974ac91 100644
--- a/app/src/lumen/res/values/dimens.xml
+++ b/app/src/lumen/res/values/dimens.xml
@@ -6,6 +6,7 @@
     <dimen name="dashboard_item_title_size">18sp</dimen>
     <dimen name="dashboard_item_content_size">14sp</dimen>
     <dimen name="normal_text_size">14sp</dimen>
-    <dimen name="title_text_size">19sp</dimen>
     <dimen name="tab_icon_size">126dp</dimen>
+    <dimen name="title_text_size">16sp</dimen>
+    <dimen name="small_text_size">12sp</dimen>
 </resources>
diff --git a/app/src/lumen/res/values/strings.xml b/app/src/lumen/res/values/strings.xml
index 3965210aa..8be8044ee 100644
--- a/app/src/lumen/res/values/strings.xml
+++ b/app/src/lumen/res/values/strings.xml
@@ -74,7 +74,7 @@
     <string name="trial_over_upgrade_lumen_title">Your Trial is Over</string>
     <string name="trial_over_upgrade_lumen_description">You can still use Lumen, but without ultimate protection and VPN. Or go premium.</string>
     <string name="trial_over_upgrade_lumen_dismiss">No, Thanks</string>
-    <string name="trial_over_upgrade_lumen_proceed">Learn More</string>
+    <string name="trial_over_upgrade_lumen_proceed">Upgrade</string>
     <plurals name="trial_period_upgrade_description">
         <item quantity="one">1 more day in the Test-Version</item>
         <item quantity="other">%d more days in the Test-Version</item>
diff --git a/app/src/main/java/com/cliqz/browser/main/FavoritesAdapter.java b/app/src/main/java/com/cliqz/browser/main/FavoritesAdapter.java
index 2a74fd264..1036fe67c 100644
--- a/app/src/main/java/com/cliqz/browser/main/FavoritesAdapter.java
+++ b/app/src/main/java/com/cliqz/browser/main/FavoritesAdapter.java
@@ -47,7 +47,7 @@ public FavoritesAdapter(ArrayList<FavoriteModel> favoriteList, Engine engine, Ha
 
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        final View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.history_viewholder,
+        final View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.favorite_viewholder,
                 parent, false);
         return new FavoritesViewHolder(view);
     }
@@ -92,32 +92,15 @@ private class FavoritesViewHolder extends IconViewHolder {
         FavoritesViewHolder(View view) {
             super(view);
             final Resources resources = view.getResources();
-            final int sideMargin = resources.getDimensionPixelSize(R.dimen.favorites_side_margins);
-            final int topMargin = resources.getDimensionPixelSize(R.dimen.favorites_top_margins);
             url = view.findViewById(R.id.history_url);
             title = view.findViewById(R.id.history_title);
             selectedOverlay = view.findViewById(R.id.selectedOverLay);
             favorites_view_parent = view.findViewById(R.id.history_view_parent);
             favorites_view_parent.setId(R.id.favorites_view_parent);
-            final FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) favorites_view_parent.getLayoutParams();
-            layoutParams.setMargins(sideMargin, topMargin, sideMargin, topMargin);
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                layoutParams.setMarginEnd(sideMargin);
-                layoutParams.setMarginStart(sideMargin);
-            }
-            favorites_view_parent.setLayoutParams(layoutParams);
-            favorites_view_parent.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    clickListener.onClick(v, getAdapterPosition());
-                }
-            });
-            favorites_view_parent.setOnLongClickListener(new View.OnLongClickListener() {
-                @Override
-                public boolean onLongClick(View v) {
-                    clickListener.onLongPress(v, getAdapterPosition());
-                    return true;
-                }
+            favorites_view_parent.setOnClickListener(v -> clickListener.onClick(v, getAdapterPosition()));
+            favorites_view_parent.setOnLongClickListener(v -> {
+                clickListener.onLongPress(v, getAdapterPosition());
+                return true;
             });
         }
     }
diff --git a/app/src/main/res/layout/history_viewholder.xml b/app/src/main/res/layout/history_viewholder.xml
deleted file mode 100644
index 3c37c1737..000000000
--- a/app/src/main/res/layout/history_viewholder.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:app="http://schemas.android.com/apk/res-auto"
-android:layout_width="wrap_content"
-android:layout_height="wrap_content">
-
-<RelativeLayout
-    android:id="@+id/history_view_parent"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="5dp"
-    android:layout_marginEnd="40dp"
-    android:layout_marginStart="20dp"
-    android:layout_marginRight="40dp"
-    android:layout_marginLeft="20dp"
-    android:layout_marginTop="5dp"
-    android:background="@drawable/history_item_bg"
-    android:gravity="start">
-
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/icon_view"
-        android:layout_width="35dp"
-        android:layout_height="35dp"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        app:actualImageScaleType="fitXY" />
-
-    <TextView
-        android:id="@+id/history_url"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@id/icon_view"
-        android:layout_toEndOf="@id/icon_view"
-        android:layout_toRightOf="@id/icon_view"
-        android:paddingStart="10dp"
-        android:paddingLeft="10dp"
-        android:paddingTop="7dp"
-        android:textColor="@color/primary_color"
-        android:textSize="12sp" />
-
-    <TextView
-        android:id="@+id/history_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@id/icon_view"
-        android:layout_alignLeft="@id/icon_view"
-        android:layout_below="@id/icon_view"
-        android:maxLines="3"
-        android:paddingBottom="10dp"
-        android:paddingEnd="10dp"
-        android:paddingRight="10dp"
-        android:paddingTop="5dp"
-        android:textColor="@color/black"
-        android:textSize="16sp" />
-
-    <TextView
-        android:id="@+id/history_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:padding="10dp"
-        android:textColor="@color/secondary_color"
-        android:textSize="12sp" />
-
-</RelativeLayout>
-
-<View
-    android:id="@+id/selectedOverLay"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginBottom="2dp"
-    android:layout_marginTop="2dp" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6e57038fe..7a92e747b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
 ext {
     compileSdkVersion = 28
     targetSdkVersion = 28
-    minSdkVersion = 19
+    minSdkVersion = 21
     buildToolsVersion = "28.0.3"
     supportLibVersion = "28.0.0"
     reactNativeVersion = "0.59.8"

From 6b51a3a7468465dd26c362cc2bdfe79bbf45ae02 Mon Sep 17 00:00:00 2001
From: ravjit-cliqz <ravjit@cliqz.com>
Date: Mon, 15 Jul 2019 15:13:10 +0200
Subject: [PATCH 34/57] AP-375 Dashboard icon is grey after subscription (#156)

---
 .../com/cliqz/browser/controlcenter/ControlCenterDialog.java    | 2 +-
 .../java/com/cliqz/browser/controlcenter/DashboardFragment.kt   | 1 +
 app/src/main/java/com/cliqz/browser/main/Messages.java          | 2 +-
 app/src/main/java/com/cliqz/browser/main/TabFragment.java       | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
index 2cf201c0c..c3657c3a3 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/ControlCenterDialog.java
@@ -157,7 +157,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                 antiTracking.setEnabled(isChecked);
                 preferenceManager.setAttrackEnabled(isChecked);
                 preferenceManager.setAdBlockEnabled(isChecked);
-                bus.post(new Messages.onDashboardStateChange());
+                bus.post(new Messages.OnDashboardStateChange());
             } catch (EngineNotYetAvailable engineNotYetAvailable) {
                 Log.e("JsEngineError", "Cannot enable/disable tracking modules",
                         engineNotYetAvailable);
diff --git a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt b/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt
index af2c09416..e58bd129f 100644
--- a/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt
+++ b/app/src/lumen/java/com/cliqz/browser/controlcenter/DashboardFragment.kt
@@ -167,6 +167,7 @@ class DashboardFragment : Fragment() {
         if (purchasesManager.purchase.isDashboardEnabled) {
             bus.post(Messages.EnableAdBlock())
             bus.post(Messages.EnableAttrack())
+            bus.post(Messages.OnDashboardStateChange())
             changeDashboardState(true)
         }
     }
diff --git a/app/src/main/java/com/cliqz/browser/main/Messages.java b/app/src/main/java/com/cliqz/browser/main/Messages.java
index 047a6136d..883a69017 100644
--- a/app/src/main/java/com/cliqz/browser/main/Messages.java
+++ b/app/src/main/java/com/cliqz/browser/main/Messages.java
@@ -282,7 +282,7 @@ public static class OnVpnPermissionGranted {
     public static class OnTrialPeriodResponse {
     }
 
-    public static class onDashboardStateChange {
+    public static class OnDashboardStateChange {
     }
 
     public static class onVpnStateChange {
diff --git a/app/src/main/java/com/cliqz/browser/main/TabFragment.java b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
index 428fefdaa..da27646c8 100644
--- a/app/src/main/java/com/cliqz/browser/main/TabFragment.java
+++ b/app/src/main/java/com/cliqz/browser/main/TabFragment.java
@@ -1378,7 +1378,7 @@ public void onOrientationChanged(Configuration newConfig) {
     }
 
     @Subscribe
-    public void onDashboardStateChange(Messages.onDashboardStateChange message) {
+    public void onDashboardStateChange(Messages.OnDashboardStateChange message) {
         updateCCIcon(false);
     }
 

From 0cbf27be870213f0f9a01f04c81b2847d0817e19 Mon Sep 17 00:00:00 2001
From: ravjit-cliqz <ravjit@cliqz.com>
Date: Mon, 15 Jul 2019 16:05:00 +0200
Subject: [PATCH 35/57] AP-381 after subscription: VPN string does not change
 (#162)

---
 app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
index 6c58f9c06..667a853af 100644
--- a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
+++ b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
@@ -369,9 +369,10 @@ private void setSelectedProfile(Context context) {
     }
 
     @Subscribe
-    public void onTrialPeriodResponse(Messages.OnAllProfilesImported onTrialPeriodResponse) {
+    public void onAllProfilesImported(Messages.OnAllProfilesImported onAllProfilesImported) {
         setSelectedProfile(getDialog().getContext());
         mSelectedCountry.setText(selectedProfile.getName());
+        mVpnCtaTitle.setText(R.string.vpn_cta_enabled);
     }
 
     @Subscribe

From d2d3b7418a437b31a81b404c7324c094ce6fe7f7 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Mon, 15 Jul 2019 16:05:13 +0200
Subject: [PATCH 36/57] AP-385 adds a spinner when performing purchases (#163)

---
 .../cliqz/browser/purchases/PurchaseFragment.kt | 17 +++++++++++++++--
 app/src/lumen/res/layout/fragment_purchase.xml  |  3 ++-
 .../lumen/res/layout/fullscreen_progress.xml    | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 app/src/lumen/res/layout/fullscreen_progress.xml

diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
index 8dc7397be..db60096fe 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
@@ -149,9 +149,22 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
 
     override fun onBuyClicked(position: Int) {
         mAdapter.getProduct(position)?.apply {
+            val contentView = view?.rootView?.findViewById<ViewGroup>(android.R.id.content)
+            val progress = LayoutInflater.from(context)
+                    .inflate(R.layout.fullscreen_progress, contentView, false)
+            contentView?.addView(progress)
+
+            // Please notice, it is pointless to add an animation to make the progress disappear,
+            // the payment interface will appear in any case half a second after the animation ends
             checkExistingPurchases(
-                    onSuccess = { activeSku -> showRestorePurchasesDialog(sku = activeSku) },
-                    onError = { makePurchase(sku) }
+                    onSuccess = {activeSku ->
+                        contentView?.removeView(progress)
+                        showRestorePurchasesDialog(sku = activeSku)
+                    },
+                    onError = {
+                        contentView?.removeView(progress)
+                        makePurchase(sku)
+                    }
             )
         }
     }
diff --git a/app/src/lumen/res/layout/fragment_purchase.xml b/app/src/lumen/res/layout/fragment_purchase.xml
index 92d6eef44..d7b4716f4 100644
--- a/app/src/lumen/res/layout/fragment_purchase.xml
+++ b/app/src/lumen/res/layout/fragment_purchase.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
diff --git a/app/src/lumen/res/layout/fullscreen_progress.xml b/app/src/lumen/res/layout/fullscreen_progress.xml
new file mode 100644
index 000000000..1c8006147
--- /dev/null
+++ b/app/src/lumen/res/layout/fullscreen_progress.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#7000"
+    android:clickable="true"
+    android:focusable="true">
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:progressTint="@color/lumen_color_blue_primary"
+        android:indeterminate="true"
+        android:layout_gravity="center"/>
+</FrameLayout>
\ No newline at end of file

From 99633ecd9b77095f0ce4221fc1712edc843f3352 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Tue, 16 Jul 2019 12:04:57 +0200
Subject: [PATCH 37/57] AP-411 (and AP-387) puts back lock icon and reader mode
 icon in the url bar (#165)

---
 .../res/drawable/ic_lock_black.xml            |  0
 app/src/lumen/res/drawable/ic_lock_lumen.xml  | 28 +++++++++++++++++++
 .../lumen/res/layout/search_bar_widget.xml    | 17 +++++------
 3 files changed, 35 insertions(+), 10 deletions(-)
 rename app/src/{main => cliqz}/res/drawable/ic_lock_black.xml (100%)
 create mode 100644 app/src/lumen/res/drawable/ic_lock_lumen.xml

diff --git a/app/src/main/res/drawable/ic_lock_black.xml b/app/src/cliqz/res/drawable/ic_lock_black.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_lock_black.xml
rename to app/src/cliqz/res/drawable/ic_lock_black.xml
diff --git a/app/src/lumen/res/drawable/ic_lock_lumen.xml b/app/src/lumen/res/drawable/ic_lock_lumen.xml
new file mode 100644
index 000000000..ff576dc70
--- /dev/null
+++ b/app/src/lumen/res/drawable/ic_lock_lumen.xml
@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,14.2L12,15.9"
+      android:strokeAlpha="0"
+      android:strokeWidth="0.7"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFFFFF"
+      android:fillType="evenOdd"
+      android:fillAlpha="0"/>
+  <path
+      android:pathData="M12,13.9m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
+      android:strokeAlpha="0"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFF"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"
+      android:fillAlpha="0"/>
+  <path
+      android:pathData="M12.5962,10.2L12.5962,8.5077C12.5962,7.9235 12.1226,7.45 11.5385,7.45C10.9543,7.45 10.4808,7.9235 10.4808,8.5077L10.4808,10.2L12.5962,10.2ZM7.9808,10.2L7.9808,8.5077C7.9808,6.5428 9.5736,4.95 11.5385,4.95C13.5033,4.95 15.0962,6.5428 15.0962,8.5077L15.0962,10.2L17,10.2L17,18.9L6,18.9L6,10.2L7.9808,10.2ZM8.5,12.7L8.5,16.4L14.5,16.4L14.5,12.7L8.5,12.7Z"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFF"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/lumen/res/layout/search_bar_widget.xml b/app/src/lumen/res/layout/search_bar_widget.xml
index b7e289d09..b2e4afd91 100644
--- a/app/src/lumen/res/layout/search_bar_widget.xml
+++ b/app/src/lumen/res/layout/search_bar_widget.xml
@@ -6,13 +6,16 @@
     android:gravity="center_vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    tools:background="@color/gray_dark">
+    android:background="@color/accent_color"
+    android:paddingStart="4dp"
+    android:paddingEnd="4dp">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon_lock"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:srcCompat="@drawable/ic_lock_black"
+        android:layout_marginEnd="4dp"
+        app:srcCompat="@drawable/ic_lock_lumen"
         app:tint="@color/white"
         android:visibility="gone"
         tools:visibility="visible" />
@@ -25,22 +28,16 @@
         android:layout_height="@dimen/title_bar_h"
         android:gravity="start|center_vertical"
         android:hint="@string/url_bar_search_hint"
-        android:paddingStart="8dp"
-        android:paddingLeft="8dp"
-        android:paddingEnd="8dp"
-        android:paddingRight="8dp"
         android:singleLine="true"
         android:textColor="#333333"
         android:textColorHint="@color/url_bar_hint_text_color"
-        android:textSize="15sp"
-        android:background="@color/accent_color"/>
+        android:textSize="15sp" />
 
     <ImageButton
         android:id="@+id/reader_mode_button"
         android:layout_width="@dimen/toolbar_menu_icon_w"
         android:layout_height="@dimen/toolbar_menu_icon_h"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginStart="4dp"
         app:srcCompat="@drawable/ic_reader_mode_off"
         android:background="@color/transparent"
         android:scaleType="fitXY"

From 4ebaa26388a56ebf45009a69ba912b32a27be183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Cla=C3=9Fen?= <philipp.classen@posteo.de>
Date: Tue, 16 Jul 2019 18:24:16 +0200
Subject: [PATCH 38/57] Fixed: config file in navigation-extension has changed
 (#169)

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b02a266ee..49f51cdf7 100644
--- a/README.md
+++ b/README.md
@@ -78,12 +78,12 @@ To also develop code from `browser-core`, follow these steps:
  ```
  3. Now, build the extension, and direct the build output to the android browser's node_modules directory. Use the `fern serve` command means that the project will be rebuild if you make code changes:
  ```shell
-  CLIQZ_OUTPUT_PATH=/path/to/android-browser/node_modules/browser-core/build/ ./fern.js serve configs/react-native.json
+  CLIQZ_OUTPUT_PATH=/path/to/android-browser/node_modules/browser-core/build/ ./fern.js serve configs/cliqz-android.js
   ```
   
 Now the dev server will see and load the updated files outputed from the fern build when you reload the code in the app.
 
-### Degugging
+### Debugging
 
 To work with react live reloading server, the Developer Support option has to
 be set on ReactInstanceManager in `/app/src/main/java/com/cliqz/jsengine/Engine.java`,

From 86fcd166d42378ef62b5715267fb60ae1057133b Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Tue, 16 Jul 2019 18:46:51 +0200
Subject: [PATCH 39/57] AP-397 removes "Send Tab to Desktop" from the menu
 (#164)

---
 app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java b/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java
index f91a8b344..d9c31ecdd 100644
--- a/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java
+++ b/app/src/main/java/com/cliqz/browser/widget/OverFlowMenu.java
@@ -329,6 +329,7 @@ private void prepareEntries() {
 
         if (BuildConfig.IS_LUMEN) {
             entries.remove(Entries.DESKTOP_PAIRING);
+            entries.remove(Entries.SEND_TAB_TO_DESKTOP);
         }
         if (BuildConfig.IS_NOT_LUMEN) {
             entries.remove(Entries.TABS);

From 2520b4a14ecb5e0dfa82fcb951acdd704fdd4fbf Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Tue, 16 Jul 2019 18:47:09 +0200
Subject: [PATCH 40/57] AP-399 rename Forget Tab to Private Tab in Lumen (#167)

---
 app/src/cliqz/res/values-de/strings.xml       |  8 +++++++
 app/src/cliqz/res/values-es/strings.xml       |  8 +++++++
 app/src/cliqz/res/values-fr/strings.xml       |  8 +++++++
 app/src/cliqz/res/values-it/strings.xml       |  8 +++++++
 app/src/cliqz/res/values-pl/strings.xml       |  8 +++++++
 app/src/cliqz/res/values-pt/strings.xml       |  8 +++++++
 app/src/cliqz/res/values-ru/strings.xml       |  8 +++++++
 app/src/cliqz/res/values/strings.xml          |  8 +++++++
 app/src/lumen/res/values/strings.xml          | 10 ++++++++
 .../com/cliqz/browser/main/MainActivity.java  |  2 +-
 app/src/main/res/values-de/strings.xml        | 23 -------------------
 app/src/main/res/values-es/strings.xml        |  8 -------
 app/src/main/res/values-fr/strings.xml        | 23 -------------------
 app/src/main/res/values-it/strings.xml        | 23 -------------------
 app/src/main/res/values-pl/strings.xml        |  8 -------
 app/src/main/res/values-pt/strings.xml        |  8 -------
 app/src/main/res/values-ru/strings.xml        |  8 -------
 app/src/main/res/values/strings.xml           |  8 -------
 18 files changed, 75 insertions(+), 110 deletions(-)

diff --git a/app/src/cliqz/res/values-de/strings.xml b/app/src/cliqz/res/values-de/strings.xml
index 96caf24b3..826f0a0af 100644
--- a/app/src/cliqz/res/values-de/strings.xml
+++ b/app/src/cliqz/res/values-de/strings.xml
@@ -25,5 +25,13 @@
     <string name="privacy_policy_title">Datenschutzerklärung - Cliqz</string>
     <string name="send_usage_data_summary">Hilf uns deine Browsernutzung zu verbessern. Cliqz sammelt streng anonyme Daten darüber, wie du Cliqz benutzt. Zu keinem Zeitpunkt wird eine PII erfasst.</string>
     <string name="user_sentiment_survey_first_line_msg">Hallo! Wir möchten sehr gerne etwas über Ihre Meinung zum Cliqz Browser erfahren. i</string>
+    <string name="action_incognito">Neuer Vergessen-Tab</string>
+    <string name="open_in_incognito_tab">In neuem Vergessen-Tab öffnen</string>
+    <string name="switched_to_forget">Vergessen-Tab automatisch aktiviert</string>
+    <string name="open_link_forget_tab">Link in Vergessen-Tab öffnen</string>
+    <string name="open_image_forget_tab">Bild in Vergessen-Tab öffnen</string>
+    <string name="incognito_tab_title">Vergessen Tab</string>
+    <string name="incognito_tab_description">Du surfst im Vergessen-Modus: Webseiten, die du in diesem Modus besuchst, werden nicht in deinem Verlauf auftauchen. Auch werden lokale Daten, Cookies mit eingeschlossen, nicht gespeichert.</string>
+    <string name="auto_forget_tab">Automatisches Vergessen-Tab</string>
 </resources>
 
diff --git a/app/src/cliqz/res/values-es/strings.xml b/app/src/cliqz/res/values-es/strings.xml
index 5a05162d0..85104e2c4 100644
--- a/app/src/cliqz/res/values-es/strings.xml
+++ b/app/src/cliqz/res/values-es/strings.xml
@@ -23,4 +23,12 @@
     <string name="eula_text">Cliqz para Android se basa en el &lt;a href=https://github.com/anthonycr/Lightning-Browser/blob/dev/LICENSE&gt;proyecto de código abierto Lightning Browser&lt;/a&gt;, y se distribuye bajo los términos de&lt;a href=https://www.mozilla.org/en-US/MPL/2.0/&gt;Mozilla Public License 2.0&lt;/a&gt;, una licencia de software libre que permite utilizar este programa con cualquier objetivo, estudiar su funcionamiento, compartirlo con tus amigos y modificarlo según tus propias necesidades. No existe un Acuerdo de Licencia de Usuario Final (ALUF) adicional.</string>
     <string name="privacy_policy_title">Política de privacidad - Cliqz</string>
     <string name="send_usage_data_summary">Ayúdanos a mejorar tu experiencia de usuario. Cliqz recopila datos anónimos sobre el uso de la aplicación. Cliqz no recopila información personal en ningún momento.</string>
+    <string name="action_incognito">Nueva pestaña privada</string>
+    <string name="open_in_incognito_tab">Abrir en una pestaña privada</string>
+    <string name="switched_to_forget">Modo privado automático activado</string>
+    <string name="open_link_forget_tab">Abrir en una pestaña privada</string>
+    <string name="open_image_forget_tab">Abrir imagen en pestaña privada</string>
+    <string name="incognito_tab_title">Pestaña privada</string>
+    <string name="incognito_tab_description">Estás navegando en modo privado: las páginas que visites no se guardarán en tu historial ni se almacenará información local, cookies incluidas.</string>
+    <string name="auto_forget_tab">Pestañas privadas automáticas</string>
 </resources>
diff --git a/app/src/cliqz/res/values-fr/strings.xml b/app/src/cliqz/res/values-fr/strings.xml
index 763529046..abed21ec5 100644
--- a/app/src/cliqz/res/values-fr/strings.xml
+++ b/app/src/cliqz/res/values-fr/strings.xml
@@ -23,4 +23,12 @@
     <string name="welcome_message">Bienvenu sur Cliqz !</string>
     <string name="agree_privacy_policy_message">Em utilisant cette application, vous acceptez les termes la &lt;font color="#00aef0"&gt;politique de confidentialié de Cliqz&lt;/font&gt;</string>
     <string name="privacy_policy_title">Politique de confidentialité - Cliqz</string>
+    <string name="action_incognito">Nouvel Onglet en Mode Oubli</string>
+    <string name="open_in_incognito_tab">Ouvrir dans un Onglet Mode Oubli</string>
+    <string name="switched_to_forget">Mode Oubli Automatique activé</string>
+    <string name="open_link_forget_tab">Ouvrir dans un Onglet Mode Oubli</string>
+    <string name="open_image_forget_tab">Ouvrir l\'image dans un Onglet Mode Oubli</string>
+    <string name="incognito_tab_title">Mode Oubli</string>
+    <string name="incognito_tab_description">Vous surfez en Mode Oubli : les sites web que vous visitez dans ce mode ne seront pas sauvegardés dans votre historique et les données locales, cookies inclus, ne seront pas conservées.</string>
+    <string name="auto_forget_tab">Mode Oubli Automatique</string>
 </resources>
diff --git a/app/src/cliqz/res/values-it/strings.xml b/app/src/cliqz/res/values-it/strings.xml
index 815ddf6d3..0fde0e357 100644
--- a/app/src/cliqz/res/values-it/strings.xml
+++ b/app/src/cliqz/res/values-it/strings.xml
@@ -25,4 +25,12 @@
     <string name="welcome_message">Cliqz ti dà il benvenuto!</string>
     <string name="privacy_policy_title">Informativa sulla Privacy - Cliqz</string>
     <string name="send_usage_data_summary">Aiutaci a migliorare la tua esperienza di navigazione. Cliqz raccoglie dati di utilizzo in forma anonima. In nessun caso vengono raccolte informazioni personali.</string>
+    <string name="action_incognito">Nuovo tab in Modalità Oblio</string>
+    <string name="open_in_incognito_tab">Apri in Modalità Oblio</string>
+    <string name="switched_to_forget">Modalità Oblio automatica attivata</string>
+    <string name="open_link_forget_tab">Apri link in nuovo tab Modalità Oblio</string>
+    <string name="open_image_forget_tab">Apri immagine in Modalità Oblio</string>
+    <string name="incognito_tab_title">Modalità Oblio</string>
+    <string name="incognito_tab_description">Stai navigando in Modalità Oblio: i siti web che visiti in questa modalità non saranno salvati nella tua cronologia e i tuoi dati locali, cookie inclusi, non verranno salvati.</string>
+    <string name="auto_forget_tab">Modalità Oblio automatica</string>
 </resources>
diff --git a/app/src/cliqz/res/values-pl/strings.xml b/app/src/cliqz/res/values-pl/strings.xml
index 88b4787ae..723960965 100644
--- a/app/src/cliqz/res/values-pl/strings.xml
+++ b/app/src/cliqz/res/values-pl/strings.xml
@@ -24,4 +24,12 @@
     <string name="privacy_policy_title">Polityka prywatności - Cliqz</string>
     <string name="settings_category_user_data_choices">Dane zbierane przez Cliqz</string>
     <string name="send_usage_data_summary">Pomóż nam udoskonalić Cliqz. Wszysztkie dane zbierane przez Cliqz są anonimowe.</string>
+    <string name="action_incognito">Nowa karta prywatna</string>
+    <string name="open_in_incognito_tab">Otwórz w nowej karcie prywatnej</string>
+    <string name="switched_to_forget">Automatyczne przełączanie w tryb prywatny zostało włączone</string>
+    <string name="open_link_forget_tab">Otwórz link w nowej prywatnej karcie</string>
+    <string name="open_image_forget_tab">Otwórz obraz w nowej prywatnej karcie</string>
+    <string name="incognito_tab_title">Karta prywatna</string>
+    <string name="incognito_tab_description">Przeglądasz Intertet w trybie prywatnym: odwiedzane przez Ciebie strony internetowe nie będą zapisane w Twojej historii, a dane lokalne, wliczając także cookies, nie będą zapisane.</string>
+    <string name="auto_forget_tab">Automatyczny tryb prywatny</string>
 </resources>
diff --git a/app/src/cliqz/res/values-pt/strings.xml b/app/src/cliqz/res/values-pt/strings.xml
index 8a7b5e596..237845ef0 100644
--- a/app/src/cliqz/res/values-pt/strings.xml
+++ b/app/src/cliqz/res/values-pt/strings.xml
@@ -23,4 +23,12 @@
     <string name="save_password_text">Você quer Cliqz salva suas senhas para esta página?</string>
     <string name="eula_text">O Navegador Cliqz para Android é desenvolvido com a utilização do &lt;a href=https://github.com/anthonycr/Lightning-Browser/blob/dev/LICENSE&gt;projeto open source Lightning Browser&lt;/a&gt;, à nossa disposição nós temos da &lt;a href=https://www.mozilla.org/en-US/MPL/2.0/&gt;Mozilla Public License 2.0&lt;/a&gt;, uma licença para software livre que concedem aos usuários a liberdade de controle na execução, análise, alterações e permite compartilhar com amigos. Não existe um Acordo de Licença do Usuário Final (EULA) separado.</string>
     <string name="send_usage_data_summary">Ajude-nos a melhorar sua experiência de navegação. Cliqz coleta dados de uso estritamente anônimos. Em nenhuma ocasião, qualquer informação pessoal seja coletada.</string>
+    <string name="action_incognito">Novo separador incógnito</string>
+    <string name="open_in_incognito_tab">Abrir em separador incógnito</string>
+    <string name="switched_to_forget">Modo privado automático ativado</string>
+    <string name="open_link_forget_tab">Abrir ligação num novo separador privado</string>
+    <string name="open_image_forget_tab">Abrir imagem num novo separador privado</string>
+    <string name="incognito_tab_title">Separador incógnito</string>
+    <string name="incognito_tab_description">Está a navegar em modo privado:Não vamos salvar nenhum histórico e dados locais, incluindo cookies, não serão salvadas.</string>
+    <string name="auto_forget_tab">Modo privado automático ativado</string>
 </resources>
diff --git a/app/src/cliqz/res/values-ru/strings.xml b/app/src/cliqz/res/values-ru/strings.xml
index 8e7be5ba1..1adb0d6ce 100644
--- a/app/src/cliqz/res/values-ru/strings.xml
+++ b/app/src/cliqz/res/values-ru/strings.xml
@@ -23,4 +23,12 @@
     <string name="eula_text">Cliqz браузер для Android разработан на основе &lt;a href=https://github.com/anthonycr/Lightning-Browser/blob/dev/LICENSE&gt;Lightning Browser открытого программного обеспечения&lt;/a&gt; и доступен Вам на основе условий &lt;a href=https://www.mozilla.org/en-US/MPL/2.0/&gt;Mozilla Public License 2.0&lt;/a&gt;, лицензии свободного ПО, которая даёт Вам право использовать программу для любых целей, изучать, как она работает, передавать копии Вашим друзьям и вносить в нее свои изменения. Отдельного лицензионного соглашениея с конечным пользователем (EULA) не существует.</string>
     <string name="privacy_policy_title">Политика безопасности - Cliqz</string>
     <string name="send_usage_data_summary">Помогите нам улучшить процесс просмотра веб-страниц. Cliqz собирает только анонимные пользовательские данные. Персональные данные не собираются ни при каких обстоятельствах.</string>
+    <string name="action_incognito">Приватная вкладка</string>
+    <string name="open_in_incognito_tab">Открыть в приватной вкладке</string>
+    <string name="switched_to_forget">Автоматическая приватная вкладка включена</string>
+    <string name="open_link_forget_tab">Открыть ссылку в приватной вкладке</string>
+    <string name="open_image_forget_tab">Открыть картинку в приватной вкладке</string>
+    <string name="incognito_tab_title">Приватная вкладка</string>
+    <string name="incognito_tab_description">Вы находитесь в приватном режиме: веб-сайты, которые вы посещаете в этом режиме, не будут сохранены в истории; локальные данные, включая куки, также не будут сохранены.</string>
+    <string name="auto_forget_tab">Автоматическая приватная вкладка</string>
 </resources>
diff --git a/app/src/cliqz/res/values/strings.xml b/app/src/cliqz/res/values/strings.xml
index 8b701f77c..612aa8cda 100644
--- a/app/src/cliqz/res/values/strings.xml
+++ b/app/src/cliqz/res/values/strings.xml
@@ -26,4 +26,12 @@
     <string name="privacy_policy_title">Privacy Policy - Cliqz</string>
     <string name="send_usage_data_summary">Help us improve your browsing experience. Cliqz collects strictly anonymous usage data. At no occasion is any PII collected.</string>
     <string name="user_sentiment_survey_first_line_msg" tools:ignore="MissingTranslation">Hello! We’d like to know your opinion about the Cliqz Browser. i</string>
+    <string name="action_incognito">New Forget Tab</string>
+    <string name="open_in_incognito_tab">Open in new Forget Tab</string>
+    <string name="switched_to_forget">Automatic Forget Tab enabled</string>
+    <string name="open_link_forget_tab">Open link in Forget Tab</string>
+    <string name="open_image_forget_tab">Open image in Forget Tab</string>
+    <string name="incognito_tab_title">Forget Tab</string>
+    <string name="incognito_tab_description">You are browsing in Forget Mode: websites you visit in this mode will not be saved in your history, and local data, including cookies, will not be stored.</string>
+    <string name="auto_forget_tab">Automatic Forget Tab</string>
 </resources>
diff --git a/app/src/lumen/res/values/strings.xml b/app/src/lumen/res/values/strings.xml
index 8be8044ee..0aca4ad18 100644
--- a/app/src/lumen/res/values/strings.xml
+++ b/app/src/lumen/res/values/strings.xml
@@ -111,4 +111,14 @@
     <string name="restore_subscription_error_msg">Nothing to restore</string>
     <string name="restore_subscription_success">Subscription restored</string>
 
+    <!-- Private Tab -->
+    <string name="action_incognito">New Private Tab</string>
+    <string name="open_in_incognito_tab">Open in new Private Tab</string>
+    <string name="switched_to_forget">Automatic Private Tab enabled</string>
+    <string name="open_link_forget_tab">Open link in Private Tab</string>
+    <string name="open_image_forget_tab">Open image in Private Tab</string>
+    <string name="incognito_tab_title">Private Tab</string>
+    <string name="incognito_tab_description">You are browsing in Private Mode: websites you visit in this mode will not be saved in your history, and local data, including cookies, will not be stored.</string>
+    <string name="auto_forget_tab">Automatic Private Tab</string>
+
 </resources>
diff --git a/app/src/main/java/com/cliqz/browser/main/MainActivity.java b/app/src/main/java/com/cliqz/browser/main/MainActivity.java
index 9cb373525..3e72d2b80 100644
--- a/app/src/main/java/com/cliqz/browser/main/MainActivity.java
+++ b/app/src/main/java/com/cliqz/browser/main/MainActivity.java
@@ -603,7 +603,7 @@ public void goToOverView(Messages.GoToOverview event) {
         currentMode = tabsManager.getCurrentTab().getTelemetryView();
         transaction.replace(R.id.content_frame, mOverViewFragment, OVERVIEW_FRAGMENT_TAG)
                 .addToBackStack(null)
-                .commit();
+                .commitAllowingStateLoss();
     }
 
     @SuppressWarnings("UnusedParameters")
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9fcfe45e9..0a9144e64 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,19 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--
-  Copyright 2014  The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
 <resources>
     <string name="action_new_tab">Neuer Tab</string>
     <string name="action_copy">Link kopieren</string>
@@ -45,7 +30,6 @@
     <string name="size_small">Klein</string>
     <string name="size_smallest">Sehr klein</string>
     <string name="title_error">Fehler</string>
-    <string name="action_incognito">Neuer Vergessen-Tab</string>
     <string name="action_find">Auf Seite suchen</string>
     <string name="cannot_download">Herunterladen nur bei \"http\" oder \"https\" URLs möglich.</string>
     <string name="download_no_sdcard_dlg_title">Keine SD-Karte</string>
@@ -105,7 +89,6 @@
     <string name="share_link">Teilen über</string>
     <string name="gps_permission">Für bessere Suchergebnisse aktivieren Sie bitte GPS</string>
     <string name="open_in_new_tab">In neuem Tab öffnen</string>
-    <string name="open_in_incognito_tab">In neuem Vergessen-Tab öffnen</string>
     <string name="not_shareable">Diese Karte kann nicht geteilt werden</string>
     <string name="clear_favorites">Favoriten löschen</string>
     <string name="clear_history">Verlauf löschen</string>
@@ -161,12 +144,9 @@
     <string name="antiphishing_text">Keine verdächtigen Aktivitäten entdeckt</string>
     <string name="antiphishing_desc">Potentiell betrügerische Webseites, die es auf deine Passwörter und Kontodaten abgesehen haben, werden mit der Anti-Phishing Technologie vorzeitig erkannt und blockiert.</string>
     <string name="learn_more"><u>mehr erfahren</u></string>
-    <string name="switched_to_forget">Vergessen-Tab automatisch aktiviert</string>
     <string name="download_image">Bild herunterladen</string>
     <string name="open_link_new_tab">Link in neuem Tab öffnen</string>
-    <string name="open_link_forget_tab">Link in Vergessen-Tab öffnen</string>
     <string name="open_image_new_tab">Bild in neuem Tab öffnen</string>
-    <string name="open_image_forget_tab">Bild in Vergessen-Tab öffnen</string>
     <string name="update_webview_msg">Dein System ist nicht auf dem aktuellsten Stand. Aktualisiere Android System WebView, um weiterhin sicher zu surfen.</string>
     <string name="update">Aktualisieren</string>
     <string name="ad_blocker_disabled_header">Werbungen werden angezeigt</string>
@@ -190,8 +170,6 @@
     <string name="device_paired_and_connected">Verbunden</string>
     <string name="device_paired_but_offline">Desktop offline</string>
     <string name="qrcode_scanner_pairing_instructions">Gehe zu ![firefox menu](firefox_menu) und wähle \'Connect\', um den QR-Code zu scannen.</string>
-    <string name="incognito_tab_title">Vergessen Tab</string>
-    <string name="incognito_tab_description">Du surfst im Vergessen-Modus: Webseiten, die du in diesem Modus besuchst, werden nicht in deinem Verlauf auftauchen. Auch werden lokale Daten, Cookies mit eingeschlossen, nicht gespeichert.</string>
     <string name="action_retry">Erneut versuchen</string>
     <string name="descr_search_bar">Suchleiste</string>
     <string name="humanweb">Human Web</string>
@@ -228,7 +206,6 @@ Damit kannst du Tabs zwischen deinem Computer und deinem mobilen Browser schicke
     <string name="showcase_youtube_title">Video Downloader</string>
     <string name="showcase_youtube_message">Lade YouTube-Videos auf dein Smartphone herunter.</string>
     <string name="please_wait">Bitte warten…</string>
-    <string name="auto_forget_tab">Automatisches Vergessen-Tab</string>
     <string name="code_scanner">QR-Code Scanner</string>
     <string name="qrcode_scanner_scanning_instructions">![QR-Code example](qr_code_icon_small) QR-Code scannen</string>
     <string name="code_scanner_title">QR-Code Scanner</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d58d557f7..7ef0a4ec9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -39,7 +39,6 @@
     <string name="title_warning">Advertencia</string>
     <string name="size_largest">Extra grande</string>
     <string name="size_large">Grande</string>
-    <string name="action_incognito">Nueva pestaña privada</string>
     <string name="cannot_download">Sólo se descargan páginas \"http\" o \"https\".</string>
     <string name="problem_download">Página no válida, imposible descargar</string>
     <string name="download_sdcard_busy_dlg_msg">Almacenamiento casi lleno. Para realizar descargas, desactiva el almacenamiento USB.</string>
@@ -91,7 +90,6 @@
     <string name="share_link">Compartir usando</string>
     <string name="gps_permission">Activa el GPS para tener mejores resultados de búsqueda</string>
     <string name="open_in_new_tab">Abrir en una pestaña nueva</string>
-    <string name="open_in_incognito_tab">Abrir en una pestaña privada</string>
     <string name="not_shareable">No se puede compartir</string>
     <string name="clear_history">Eliminar historial</string>
     <string name="clear_favorites">Eliminar favoritos</string>
@@ -159,11 +157,8 @@ Las falsificaciones de páginas web están diseñadas para engañar al usuario,
     <string name="antiphishing_header">Navegas seguro</string>
     <string name="antiphishing_text">No se han detectado actividades sospechosas</string>
     <string name="learn_more"><u>Saber más</u></string>
-    <string name="switched_to_forget">Modo privado automático activado</string>
     <string name="open_link_new_tab">Abrir en una pestaña nueva</string>
-    <string name="open_link_forget_tab">Abrir en una pestaña privada</string>
     <string name="open_image_new_tab">Abrir imagen en una pestaña nueva</string>
-    <string name="open_image_forget_tab">Abrir imagen en pestaña privada</string>
     <string name="download_image">Descargar imagen</string>
     <string name="update_webview_msg">Tu sistema no está actualizado. Para navegar seguro, por favor actualiza WebView del sistema Android.</string>
     <string name="update">Actualizar</string>
@@ -189,8 +184,6 @@ Las falsificaciones de páginas web están diseñadas para engañar al usuario,
     <string name="action_retry">Reintentar</string>
     <string name="pairing_successful_title">Conexión establecida</string>
     <string name="pairing_successful_message">¡Has conectado tu primer dispositivo!\n\nAhora puedes enviar pestañas entre el ordenador y tu dispositivo portátil. También puedes descargar vídeos directamente desde el ordenador a tu terminal.</string>
-    <string name="incognito_tab_title">Pestaña privada</string>
-    <string name="incognito_tab_description">Estás navegando en modo privado: las páginas que visites no se guardarán en tu historial ni se almacenará información local, cookies incluidas.</string>
     <string name="rename_paired_device">Renombrar</string>
     <string name="pairing_device_rename_title">Renombrar conexión</string>
     <string name="pairing_device_rename_message">Introduce un nombre nuevo para la conexión:</string>
@@ -204,7 +197,6 @@ Las falsificaciones de páginas web están diseñadas para engañar al usuario,
     <string name="resume_tab_dialog_msg">¿Quieres restaurar las pestañas abiertas previamente?</string>
     <string name="action_resume">Restaurar</string>
     <string name="action_close_all_tabs">Cerrar todas las pestañas</string>
-    <string name="auto_forget_tab">Pestañas privadas automáticas</string>
     <string name="showcase_youtube_title">Descarga de vídeos</string>
     <string name="showcase_youtube_message">Descarga vídeos de YouTube en tu teléfono.</string>
     <string name="please_wait">Por favor, espera…</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0dabba727..7718fe4ae 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,19 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_new_tab">Nouvel onglet</string>
     <string name="action_copy">Copier le lien</string>
@@ -45,7 +30,6 @@
     <string name="size_small">Petit</string>
     <string name="size_smallest">Très petit</string>
     <string name="title_error">Erreur</string>
-    <string name="action_incognito">Nouvel Onglet en Mode Oubli</string>
     <string name="action_find">Chercher dans la page</string>
     <string name="cannot_download">On ne peut télécharger que les URLs « http » ou « https ».</string>
     <string name="problem_download">URL non valide rencontrée, téléchargement impossible</string>
@@ -107,7 +91,6 @@ Continuer tout de même ?</string>
     <string name="share_link">Partager avec</string>
     <string name="gps_permission">Veuillez activer votre GPS pour de meilleur résultats de recherche</string>
     <string name="open_in_new_tab">Ouvrir dans un nouvel onglet</string>
-    <string name="open_in_incognito_tab">Ouvrir dans un Onglet Mode Oubli</string>
     <string name="not_shareable">Cette carte n\'est pas partageable</string>
     <string name="clear_history">Supprimer l\'historique</string>
     <string name="clear_favorites">Supprimer les marque-pages</string>
@@ -182,13 +165,8 @@ Continuer tout de même ?</string>
     <string name="control_center_header_adblocking">Bloqueur de Pubs</string>
     <string name="update">Mettre à jour</string>
     <string name="update_webview_msg">Le système n\'est pas à jour. Afin de naviguer en toute sécurité, bien vouloir mettre à jour la version Android.</string>
-    <string name="open_image_forget_tab">Ouvrir l\'image dans un Onglet Mode Oubli</string>
     <string name="open_image_new_tab">Ouvrir l\'image dans un nouvel onglet</string>
-    <string name="open_link_forget_tab">Ouvrir dans un Onglet Mode Oubli</string>
     <string name="open_link_new_tab">Ouvrir dans un nouvel onglet</string>
-    <string name="switched_to_forget">Mode Oubli Automatique activé</string>
-    <string name="incognito_tab_title">Mode Oubli</string>
-    <string name="incognito_tab_description">Vous surfez en Mode Oubli : les sites web que vous visitez dans ce mode ne seront pas sauvegardés dans votre historique et les données locales, cookies inclus, ne seront pas conservées.</string>
     <string name="desktop_pairing">Connect</string>
     <string name="unpair_device">Éliminer</string>
     <string name="device_paired_and_connected">Connecté</string>
@@ -217,7 +195,6 @@ Continuer tout de même ?</string>
     <string name="action_resume">Restaurer</string>
     <string name="resume_tab_dialog_msg">Voulez-vous restaurer tous les onglets précédents ?</string>
     <string name="action_close_all_tabs">Fermer tous les onglets</string>
-    <string name="auto_forget_tab">Mode Oubli Automatique</string>
     <string name="showcase_youtube_title">Téléchargeur des vidéos</string>
     <string name="showcase_youtube_message">Téléchargez des vidéos sur votre smartphone.</string>
     <string name="please_wait">Attendez SVP…</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 20be0a4de..b0c1a9b6a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,19 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="action_new_tab">Nuovo tab</string>
     <string name="action_copy">Copia link</string>
@@ -45,7 +30,6 @@
     <string name="size_small">Piccolo</string>
     <string name="size_smallest">Più piccolo</string>
     <string name="title_error">Errore</string>
-    <string name="action_incognito">Nuovo tab in Modalità Oblio</string>
     <string name="action_find">Trova nella pagina</string>
     <string name="download_pending">Inizio download</string>
     <string name="cannot_download">Puoi scaricare solo URL con \"http\" o \"https\".</string>
@@ -110,7 +94,6 @@ Procedere comunque?</string>
     <string name="deleting_in_progress_message">Cancellazione in corso…</string>
     <string name="gps_permission">Attiva il GPS per una ricerca migliore</string>
     <string name="not_shareable">Questa scheda non può essere condivisa</string>
-    <string name="open_in_incognito_tab">Apri in Modalità Oblio</string>
     <string name="open_in_new_tab">Apri in nuovo tab</string>
     <string name="add_to_favourites">Aggiungi ai segnalibri</string>
     <string name="save_link">Salva link</string>
@@ -153,9 +136,7 @@ Procedere comunque?</string>
     <string name="autocompletion_enabled">Attiva autocompletamento</string>
     <string name="request_desktop_site">Modalità Desktop</string>
     <string name="learn_more"><u>Per saperne di più</u></string>
-    <string name="switched_to_forget">Modalità Oblio automatica attivata</string>
     <string name="open_link_new_tab">Apri link in nuovo tab</string>
-    <string name="open_link_forget_tab">Apri link in nuovo tab Modalità Oblio</string>
     <string name="open_image_new_tab">Apri immagine in nuovo tab</string>
     <string name="download_image">Scarica immagine</string>
     <string name="update_webview_msg">Il tuo sistema operativo non è aggiornato. Per navigare in modo sicuro, aggiorna Android System Webview.</string>
@@ -184,8 +165,6 @@ Procedere comunque?</string>
     <string name="usa">Stati Uniti</string>
     <string name="regional_settings">Risultati di ricerca per</string>
     <string name="report_site">Segnala un sito web</string>
-    <string name="incognito_tab_title">Modalità Oblio</string>
-    <string name="incognito_tab_description">Stai navigando in Modalità Oblio: i siti web che visiti in questa modalità non saranno salvati nella tua cronologia e i tuoi dati locali, cookie inclusi, non verranno salvati.</string>
     <string name="humanweb">Human Web</string>
     <string name="descr_search_bar">Barra di ricerca</string>
     <string name="showcase_antitracking_title">Pannello di Controllo</string>
@@ -214,7 +193,6 @@ Procedere comunque?</string>
     <string name="resume_tab_dialog_msg">Vuoi ripristinare i tab precedentemente aperti?</string>
     <string name="action_resume">Ripristina</string>
     <string name="action_close_all_tabs">Chiudi tutti i tab</string>
-    <string name="auto_forget_tab">Modalità Oblio automatica</string>
     <string name="showcase_youtube_title">Downloader video</string>
     <string name="showcase_youtube_message">Scarica video da YouTube direttamente sul tuo smartphone.</string>
     <string name="please_wait">Un attimo, per favore…</string>
@@ -277,7 +255,6 @@ Procedere comunque?</string>
         <item quantity="other">%d elementi selezionati</item>
     </plurals>
     <string name="message_url_copied">URL copiata</string>
-    <string name="open_image_forget_tab">Apri immagine in Modalità Oblio</string>
     <string name="control_center_header_overview">PANORAMICA</string>
     <string name="control_center_header_trackers">TRACKER</string>
     <string name="trust_site">Sito affidabile</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3f728198a..e4f614d3e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -22,7 +22,6 @@
     <string name="size_small">Mały</string>
     <string name="size_smallest">Najmniejszy</string>
     <string name="title_error">Błąd</string>
-    <string name="action_incognito">Nowa karta prywatna</string>
     <string name="action_find">Znajdź na stronie</string>
     <string name="download_no_sdcard_dlg_title">Brak karty SD</string>
     <string name="block_ads">Blokowanie reklam</string>
@@ -91,7 +90,6 @@
     <string name="share_link">Udostępnij za pomocą</string>
     <string name="gps_permission">Aktywuj GPS, aby uzyskać lepsze wyniki wyszukiwania</string>
     <string name="open_in_new_tab">Otwórz w nowej karcie</string>
-    <string name="open_in_incognito_tab">Otwórz w nowej karcie prywatnej</string>
     <string name="not_shareable">Tej karty nie można udostępnić</string>
     <string name="clear_history">Wyczyść historię</string>
     <string name="clear_favorites">Wyczyść ulubione</string>
@@ -152,11 +150,8 @@
     <string name="antiphishing_text">Nie wykryto podejrzanej aktywności</string>
     <string name="antiphishing_desc">Technologia przeciwdziałająca zwodniczym stronom (anti-phishing) rozpoznaje i blokuje strony, które mogą próbować uzyskać dostęp do Twoich haseł i kont zanim odwiedzisz te strony.</string>
     <string name="learn_more"><u>Czytaj więcej</u></string>
-    <string name="switched_to_forget">Automatyczne przełączanie w tryb prywatny zostało włączone</string>
     <string name="open_link_new_tab">Otwórz link w nowej karcie</string>
-    <string name="open_link_forget_tab">Otwórz link w nowej prywatnej karcie</string>
     <string name="open_image_new_tab">Otwórz obraz w nowej karcie</string>
-    <string name="open_image_forget_tab">Otwórz obraz w nowej prywatnej karcie</string>
     <string name="download_image">Zapisz obraz</string>
     <string name="update_webview_msg">Twój system nie jest aktualny. Aby bezpiecznie przeglądać Internet, zaktualizuj Android System WebView.</string>
     <string name="update">Aktualizacja</string>
@@ -184,8 +179,6 @@
     <string name="action_retry">Ponów</string>
     <string name="pairing_successful_title">Połączenie zakończone sukcesem</string>
     <string name="pairing_successful_message">Połączyłeś swoje pierwsze urządzenie.\n\nMożesz teraz przesyłać karty między przeglądarką desktopową i Twoim urządzeniem mobilnym. Możesz także ściągać filmy bezpośrednio z przeglądarki desktopowej na swoje urządzenie mobilne.</string>
-    <string name="incognito_tab_title">Karta prywatna</string>
-    <string name="incognito_tab_description">Przeglądasz Intertet w trybie prywatnym: odwiedzane przez Ciebie strony internetowe nie będą zapisane w Twojej historii, a dane lokalne, wliczając także cookies, nie będą zapisane.</string>
     <string name="rename_paired_device">Zmień nazwę</string>
     <string name="pairing_device_rename_title">Zmień nazwę połączenia</string>
     <string name="pairing_device_rename_message">Wprowadź nową nazwę połączenia:</string>
@@ -199,7 +192,6 @@
     <string name="resume_tab_dialog_msg">Czy chcesz przywrócić wszystkie poprzednio otwarte karty?</string>
     <string name="action_resume">Przywróć</string>
     <string name="action_close_all_tabs">Zamknij wszystkie karty</string>
-    <string name="auto_forget_tab">Automatyczny tryb prywatny</string>
     <string name="showcase_youtube_title">Asystent pobierania plików</string>
     <string name="showcase_youtube_message">Pobierz filmy z YouTube na swój smartfon.</string>
     <string name="please_wait">Proszę czekać…</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 64d1bfb40..dca151f20 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -30,7 +30,6 @@
     <string name="size_small">Pequeno</string>
     <string name="size_smallest">Menor</string>
     <string name="title_error">Erro</string>
-    <string name="action_incognito">Novo separador incógnito</string>
     <string name="action_find">Localizar na página</string>
     <string name="cannot_download">Apenas possível para os URL \\\"http\\\" ou \\\"https\\\".</string>
     <string name="problem_download">URL inválido e a descarga não é possível</string>
@@ -93,7 +92,6 @@ Gostaria de utilizar a sua localização</string>
     <string name="share_link">Compartilhar usando</string>
     <string name="gps_permission">Ativa GPS para ter melhor resultados de busca</string>
     <string name="open_in_new_tab">Abrir em novo separador</string>
-    <string name="open_in_incognito_tab">Abrir em separador incógnito</string>
     <string name="not_shareable">Não pode compartilhar</string>
     <string name="clear_history">Limpar histórico</string>
     <string name="clear_favorites">Limpar favoritos</string>
@@ -154,9 +152,7 @@ Gostaria de utilizar a sua localização</string>
     <string name="antiphishing_text">Não foram identificado atividades suspeitas</string>
     <string name="learn_more"><u> 1Sabe mais</u> 2</string>
     <string name="open_link_new_tab">Abrir ligação num novo separador</string>
-    <string name="open_link_forget_tab">Abrir ligação num novo separador privado</string>
     <string name="open_image_new_tab">Abrir imagem num novo separador</string>
-    <string name="open_image_forget_tab">Abrir imagem num novo separador privado</string>
     <string name="download_image">Descargar imagem</string>
     <string name="update">Atualizar</string>
     <string name="ad_blocker_disabled_header">Anúncios visíveis</string>
@@ -178,7 +174,6 @@ Gostaria de utilizar a sua localização</string>
  ![cc_enabled](ic_cc_enabled_white_bg) Proteção ativada&lt;br&gt;
  ![cc_disabled](ic_cc_whitelisted_white_bg) Proteção desativada</string>
     <string name="antiphishing_desc">A tecnologia Anti-Phishing identifica e bloqueia sites enganosos, que tentam roubar suas palavras-passe ou outros dados sensíveis.</string>
-    <string name="switched_to_forget">Modo privado automático ativado</string>
     <string name="update_webview_msg">Seu sistema não está atualizado. Para navegar seguro, por favor atualiza Android System WebView.</string>
     <string name="msg_camera_framework_bug">Desculpe, tem um problema com a câmara. Talvez precisa reiniciar o dispositivo.</string>
     <string name="report_site">Denunciar uma página</string>
@@ -190,8 +185,6 @@ Gostaria de utilizar a sua localização</string>
     <string name="pairing_successful_message">Você conectou seu primeiro dispositivo!
 
 Está pronto para mandar separadores entre seu computador e seu telemóvel. Também pode descarregar vídeos desde o navegador do seu computador e seu telemóvel.</string>
-    <string name="incognito_tab_title">Separador incógnito</string>
-    <string name="incognito_tab_description">Está a navegar em modo privado:Não vamos salvar nenhum histórico e dados locais, incluindo cookies, não serão salvadas.</string>
     <string name="rename_paired_device">Renomear</string>
     <string name="pairing_device_rename_title">Renomear ligação</string>
     <string name="pairing_device_rename_hint">Novo nome</string>
@@ -204,7 +197,6 @@ Está pronto para mandar separadores entre seu computador e seu telemóvel. Tamb
     <string name="resume_tab_dialog_msg">Gostaria de restaurar todos os separadores abertos anteriormente?</string>
     <string name="action_resume">Restaurar</string>
     <string name="action_close_all_tabs">Fechar todos os separadores</string>
-    <string name="auto_forget_tab">Modo privado automático ativado</string>
     <string name="showcase_youtube_title">Descarregar vidoes</string>
     <string name="showcase_youtube_message">"Descarregar vídeos de YouTube  em seu telemóvel."</string>
     <string name="please_wait">Por favor, aguarde…</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 42d405bc7..98b5b8c60 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -28,7 +28,6 @@
     <string name="size_small">Маленький</string>
     <string name="size_smallest">Мелкий</string>
     <string name="title_error">Ошибка</string>
-    <string name="action_incognito">Приватная вкладка</string>
     <string name="action_find">Найти на странице</string>
     <string name="download_no_sdcard_dlg_title">Нет карты памяти</string>
     <string name="download_sdcard_busy_dlg_title">USB хранилище недоступно</string>
@@ -77,7 +76,6 @@
     <string name="imprint">Правовая информация</string>
     <string name="gps_permission">Пожалуйста, включите GPS для улучшения результатов поиска</string>
     <string name="open_in_new_tab">Открыть в новой вкладке</string>
-    <string name="open_in_incognito_tab">Открыть в приватной вкладке</string>
     <string name="clear_history">Очистить историю</string>
     <string name="clear_favorites">Очистить закладки</string>
     <string name="deleting_in_progress_message">Удаление…</string>
@@ -126,9 +124,7 @@
     <string name="antiphishing_text">Не было замечено подозрительной активности</string>
     <string name="learn_more"><u>Узнать больше</u></string>
     <string name="open_link_new_tab">Открыть ссылку в новой вкладке</string>
-    <string name="open_link_forget_tab">Открыть ссылку в приватной вкладке</string>
     <string name="open_image_new_tab">Открыть картинку в новой вкладке</string>
-    <string name="open_image_forget_tab">Открыть картинку в приватной вкладке</string>
     <string name="download_image">Скачать картинку</string>
     <string name="update">Обновить</string>
     <string name="ad_blocker_disabled_header">Реклама отображается</string>
@@ -151,7 +147,6 @@
     <string name="pairing_error_title">Ошибка соединения</string>
     <string name="action_retry">Попробуйте ещё раз</string>
     <string name="pairing_successful_title">Соединение установлено</string>
-    <string name="incognito_tab_title">Приватная вкладка</string>
     <string name="rename_paired_device">Переименовать</string>
     <string name="pairing_device_rename_title">Переименовать соединение</string>
     <string name="pairing_device_rename_message">Введите новое имя для соединения:</string>
@@ -204,17 +199,14 @@
     <string name="adblocking_header">Вы сёрфите в интернете без рекламы</string>
     <string name="adblocking_header_disabled">Вы сёрфите в интернете с рекламой</string>
     <string name="antiphishing_desc">Технология Anti-Phishing идентифицирует и блокирует потенциально опасные веб-сайты, которые пытаются получить ваши пароли или информацию об аккаунте.</string>
-    <string name="switched_to_forget">Автоматическая приватная вкладка включена</string>
     <string name="update_webview_msg">Ваша система не обновлена. Чтобы безопасно просматривать страницы, обновите Android System WebView.</string>
     <string name="msg_camera_framework_bug">Извините, у камеры Android возникла проблема. Возможно, вам потребуется перезапустить устройство.</string>
     <string name="device_paired_but_offline">Компьютер оффлайн</string>
     <string name="report_site">Сообщить о веб-сайте</string>
     <string name="pairing_successful_message">Вы подключили ваше первое устройство!\n\nТеперь вы можете передавать вкладки между вашим компьютером и вашим мобильным устройством. Вы также можете скачивать видео напрямую с вашего компьютера на ваше мобильное устройство.</string>
-    <string name="incognito_tab_description">Вы находитесь в приватном режиме: веб-сайты, которые вы посещаете в этом режиме, не будут сохранены в истории; локальные данные, включая куки, также не будут сохранены.</string>
     <string name="query_suggestion">Искать в предложенных запросах</string>
     <string name="action_undo">Отменить</string>
     <string name="resume_tab_dialog_msg">Вы хотите восстановить все предыдущие открытые вкладки?</string>
-    <string name="auto_forget_tab">Автоматическая приватная вкладка</string>
     <string name="action_go_to_connect">Перейти в \'Connect\'</string>
     <string name="subscribe_soccer_league">Лига</string>
     <string name="subscribe_soccer_club">Команда</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9f39f177c..d77057f32 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,7 +30,6 @@
     <string name="size_small">Small</string>x
     <string name="size_smallest">Smallest</string>
     <string name="title_error">Error</string>
-    <string name="action_incognito">New Forget Tab</string>
     <string name="action_find">Find in Page</string>
     <string name="download_pending">Pending download</string>
     <string name="cannot_download">Can only download \"http\" or \"https\" URLs.</string>
@@ -93,7 +92,6 @@
     <string name="share_link">Share using</string>
     <string name="gps_permission">Please enable GPS for better search results</string>
     <string name="open_in_new_tab">Open in new tab</string>
-    <string name="open_in_incognito_tab">Open in new Forget Tab</string>
     <string name="not_shareable">This card is not shareable</string>
     <string name="clear_history">Clear history</string>
     <string name="clear_favorites">Clear favorites</string>
@@ -160,12 +158,9 @@
     <string name="antiphishing_text">No phishing activities detected</string>
     <string name="antiphishing_desc">Anti-Phishing technology identifies and blocks potentially deceptive websites that try to get your passwords or account data before you visit the site.</string>
     <string name="learn_more"><u>Learn more</u></string>
-    <string name="switched_to_forget">Automatic Forget Tab enabled</string>
     <string name="extension_version" translatable="false">Extension Version</string>
     <string name="open_link_new_tab">Open link in new tab</string>
-    <string name="open_link_forget_tab">Open link in Forget Tab</string>
     <string name="open_image_new_tab">Open image in new tab</string>
-    <string name="open_image_forget_tab">Open image in Forget Tab</string>
     <string name="download_image">Download image</string>
     <string name="update_webview_msg">Your system is not up-to-date. To browse securely, please update Android System WebView.</string>
     <string name="update">Update</string>
@@ -195,8 +190,6 @@
     <string name="pairing_successful_message">You connected your first device!
 
 Now you are ready to send tabs between your desktop and your mobile device. You can also directly download videos from your desktop browser to your mobile device.</string>
-    <string name="incognito_tab_title">Forget Tab</string>
-    <string name="incognito_tab_description">You are browsing in Forget Mode: websites you visit in this mode will not be saved in your history, and local data, including cookies, will not be stored.</string>
     <string name="rename_paired_device">Rename</string>
     <string name="pairing_device_rename_title">Rename connection</string>
     <string name="pairing_device_rename_message">Enter a new name for the connection:</string>
@@ -231,7 +224,6 @@ Now you are ready to send tabs between your desktop and your mobile device. You
     <string name="cdn">CDN</string>
     <string name="control_center_tracker_ad_blocked">%1$d Trackers</string>
     <string name="action_close_all_tabs">Close All Tabs</string>
-    <string name="auto_forget_tab">Automatic Forget Tab</string>
     <string name="showcase_youtube_title">Video Downloader</string>
     <string name="showcase_youtube_message">Download YouTube videos to your Smartphone.</string>
     <string name="please_wait">Please, wait…</string>

From ebdad84d464a82047cdcb47735e5d663f001691d Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Tue, 16 Jul 2019 18:47:25 +0200
Subject: [PATCH 41/57] AP-374 makes downgrade not possible (#170)

---
 .../browser/purchases/PurchaseFragment.kt     | 79 +++++++------------
 .../browser/purchases/PurchasesManager.kt     |  7 +-
 .../purchases/SubscriptionConstants.kt        | 61 +++++++++-----
 .../productlist/ProductListAdapter.kt         | 39 +++++----
 4 files changed, 94 insertions(+), 92 deletions(-)

diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
index db60096fe..5142d6377 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
@@ -3,34 +3,28 @@ package com.cliqz.browser.purchases
 import acr.browser.lightning.preference.PreferenceManager
 import android.app.Activity
 import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import androidx.recyclerview.widget.LinearLayoutManager
-
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.android.billingclient.api.BillingClient
-
 import com.cliqz.browser.R
 import com.cliqz.browser.app.BrowserApp
 import com.cliqz.browser.main.MainActivity
 import com.cliqz.browser.main.Messages
+import com.cliqz.browser.purchases.Products.PRODUCTS_LIST
 import com.cliqz.browser.purchases.productlist.OnBuyClickListener
 import com.cliqz.browser.purchases.productlist.ProductListAdapter
 import com.cliqz.browser.purchases.productlist.ProductRowData
-import com.revenuecat.purchases.interfaces.ReceiveEntitlementsListener
-import kotlinx.android.synthetic.lumen.fragment_purchase.*
-import com.cliqz.browser.purchases.SubscriptionConstants.Entitlements
-import com.cliqz.browser.purchases.SubscriptionConstants.ProductId
-import com.cliqz.browser.purchases.SubscriptionConstants.ProductName
 import com.cliqz.nove.Bus
 import com.revenuecat.purchases.*
-import java.util.*
+import com.revenuecat.purchases.interfaces.ReceiveEntitlementsListener
+import kotlinx.android.synthetic.lumen.fragment_purchase.*
 import javax.inject.Inject
-import kotlin.collections.ArrayList
 
 private val TAG = PurchaseFragment::class.java.simpleName
 
@@ -66,7 +60,7 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
     }
 
     private fun initializeViews() {
-        mAdapter = ProductListAdapter(context, null, this)
+        mAdapter = ProductListAdapter(context, this)
         product_list.adapter = mAdapter
         product_list.layoutManager = LinearLayoutManager(context)
 
@@ -88,31 +82,28 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
     private fun getProductDetails() {
         Purchases.sharedInstance.getEntitlements(object : ReceiveEntitlementsListener {
             override fun onReceived(entitlementMap: Map<String, Entitlement>) {
-                val productList = ArrayList<ProductRowData>()
-                var isSubscribed = false
-                val entitlement = if (entitlementMap[Entitlements.PREMIUM_SALE] == null) {
-                    entitlementMap[Entitlements.PREMIUM_SALE_STAGING]
-                } else {
-                    entitlementMap[Entitlements.PREMIUM_SALE]
-                }
+                val entitlement = entitlementMap[Entitlements.PREMIUM_SALE] ?: entitlementMap[Entitlements.PREMIUM_SALE_STAGING]
+
+                val productSet = entitlement?.offerings?.map { (_, offering) ->
+                    offering.activeProductIdentifier to offering.skuDetails
+                }?.toMap() ?: emptyMap()
+                val productList = PRODUCTS_LIST
+                        .mapNotNull { sku -> productSet[sku] }
+                        .map { ProductRowData(
+                                it.sku,
+                                it.title,
+                                it.price,
+                                it.description,
+                                it.sku == purchasesManager.purchase.sku
+                        )}
+                val subscription = productList.find { it.isSubscribed }
 
-                entitlement?.offerings?.forEach { (_, offering) ->
-                    offering.skuDetails?.apply {
-                        if (sku == purchasesManager.purchase.sku) {
-                            isSubscribed = true
-                            productList.add(ProductRowData(sku, title, price, description, true))
-                        } else {
-                            productList.add(ProductRowData(sku, title, price, description, false))
-                        }
-                    }
-                }
                 if (productList.isEmpty()) {
                     Toast.makeText(context, "Error retrieving available products", Toast.LENGTH_LONG).show()
                     Log.e(TAG, "Product list is empty.")
                     dismiss()
                 } else {
-                    customSwapProductListElements(productList)
-                    mAdapter.setHasSubscription(isSubscribed)
+                    mAdapter.setSubscription(subscription)
                     mAdapter.updateProductList(productList)
                 }
                 setLoading(false)
@@ -125,18 +116,6 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
         })
     }
 
-    /**
-     * The middle product in the list should always be "Basic + VPN".
-     */
-    private fun customSwapProductListElements(productList: List<ProductRowData>) {
-        if (productList.size < 2) return
-        val middleElement = productList[1]
-        val basicVpnProductElement: ProductRowData = productList.find {
-            it.sku in setOf(ProductId.BASIC_VPN, ProductId.BASIC_VPN_STAGING)
-        } ?: return
-        Collections.swap(productList, productList.indexOf(basicVpnProductElement), productList.indexOf(middleElement))
-    }
-
     fun setLoading(flag: Boolean) {
         product_list.visibility = if (flag) View.GONE else View.VISIBLE
         loading.visibility = if (flag) View.VISIBLE else View.GONE
@@ -148,7 +127,7 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
     }
 
     override fun onBuyClicked(position: Int) {
-        mAdapter.getProduct(position)?.apply {
+        mAdapter.getProduct(position).apply {
             val contentView = view?.rootView?.findViewById<ViewGroup>(android.R.id.content)
             val progress = LayoutInflater.from(context)
                     .inflate(R.layout.fullscreen_progress, contentView, false)
@@ -228,19 +207,19 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
 
     private fun enableFeatures(sku: String) {
         when (sku) {
-            ProductId.BASIC_VPN, ProductId.BASIC_VPN_STAGING -> {
+            Products.BASIC_PLUS_VPN -> {
                 purchasesManager.purchase.isVpnEnabled = true
                 purchasesManager.purchase.isDashboardEnabled = true
                 preferenceManager.isAttrackEnabled = true
                 preferenceManager.adBlockEnabled = true
             }
-            ProductId.BASIC, ProductId.BASIC_STAGING -> {
+            Products.BASIC -> {
                 purchasesManager.purchase.isVpnEnabled = false
                 purchasesManager.purchase.isDashboardEnabled = true
                 preferenceManager.isAttrackEnabled = true
                 preferenceManager.adBlockEnabled = true
             }
-            ProductId.VPN, ProductId.VPN_STAGING -> {
+            Products.VPN -> {
                 purchasesManager.purchase.isVpnEnabled = true
                 purchasesManager.purchase.isDashboardEnabled = false
                 preferenceManager.isAttrackEnabled = false
@@ -257,9 +236,9 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
     }
 
     private fun getProductNameById(sku: String) = when (sku) {
-        ProductId.BASIC, ProductId.BASIC_STAGING -> ProductName.BASIC
-        ProductId.VPN, ProductId.VPN_STAGING -> ProductName.VPN
-        ProductId.BASIC_VPN, ProductId.BASIC_VPN_STAGING -> ProductName.BASIC_VPN
+        Products.BASIC -> ProductName.BASIC
+        Products.VPN -> ProductName.VPN
+        Products.BASIC_PLUS_VPN -> ProductName.BASIC_VPN
         else -> IllegalArgumentException("Invalid product id $sku")
     }
 }
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
index 0e8ffe420..e0758f650 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchasesManager.kt
@@ -4,7 +4,6 @@ import acr.browser.lightning.preference.PreferenceManager
 import android.content.Context
 import android.util.Log
 import com.cliqz.browser.main.Messages
-import com.cliqz.browser.purchases.SubscriptionConstants.ProductId
 import com.cliqz.browser.purchases.trial.ServerData
 import com.cliqz.browser.purchases.trial.TrialPeriodLocalRepo
 import com.cliqz.browser.purchases.trial.TrialPeriodRemoteRepo
@@ -43,10 +42,8 @@ class PurchasesManager(
         if (purchaserInfo.activeSubscriptions.isNotEmpty()) {
             // If subscribed, enable features.
             for (sku in purchaserInfo.activeSubscriptions) {
-                val isVpnEnabled = sku in setOf(ProductId.VPN, ProductId.VPN_STAGING,
-                        ProductId.BASIC_VPN, ProductId.BASIC_VPN_STAGING)
-                val isDashboardEnabled = sku in setOf(ProductId.BASIC, ProductId.BASIC_STAGING,
-                        ProductId.BASIC_VPN, ProductId.BASIC_VPN_STAGING)
+                val isVpnEnabled = sku == Products.VPN || sku == Products.BASIC_PLUS_VPN
+                val isDashboardEnabled = sku == Products.BASIC || sku == Products.BASIC_PLUS_VPN
                 purchase.apply {
                     this.isASubscriber = true
                     this.isVpnEnabled = isVpnEnabled
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/SubscriptionConstants.kt b/app/src/lumen/java/com/cliqz/browser/purchases/SubscriptionConstants.kt
index 788f6f2a7..7a9a26b13 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/SubscriptionConstants.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/SubscriptionConstants.kt
@@ -1,29 +1,48 @@
 package com.cliqz.browser.purchases
 
-class SubscriptionConstants {
+import com.cliqz.browser.BuildConfig
 
-    internal object Entitlements {
-        const val PREMIUM_SALE_STAGING = "[Staging] Premium Sale"
-        const val PREMIUM_SALE = "Premium Sale"
-    }
+internal object Entitlements {
+    const val PREMIUM_SALE_STAGING = "[Staging] Premium Sale"
+    const val PREMIUM_SALE = "Premium Sale"
+}
+
+/**
+ * ProductIds on RevenueCat and Google Play Console.
+ */
+internal object Products {
+    val BASIC = if (BuildConfig.DEBUG)
+            "com.cliqz.android.lumen.staging.sale.basic"
+        else
+            "com.cliqz.android.lumen.sale.basic"
+
+    val VPN = if (BuildConfig.DEBUG)
+            "com.cliqz.android.lumen.staging.sale.vpn"
+        else
+            "com.cliqz.android.lumen.sale.vpn"
+
+    val BASIC_PLUS_VPN = if (BuildConfig.DEBUG)
+            "com.cliqz.android.lumen.staging.sale.basic_vpn"
+        else
+            "com.cliqz.android.lumen.sale.basic_vpn"
 
     /**
-     * ProductId on RevenueCat and Google Play Console.
+     * This is the order in which products should be displayed
      */
-    internal object ProductId {
-        const val BASIC = "com.cliqz.android.lumen.sale.basic"
-        const val VPN = "com.cliqz.android.lumen.sale.vpn"
-        const val BASIC_VPN = "com.cliqz.android.lumen.sale.basic_vpn"
-
-        const val BASIC_STAGING = "com.cliqz.android.lumen.staging.sale.basic"
-        const val VPN_STAGING = "com.cliqz.android.lumen.staging.sale.vpn"
-        const val BASIC_VPN_STAGING = "com.cliqz.android.lumen.staging.sale.basic_vpn"
-    }
-
-    internal object ProductName {
-        const val BASIC = "Basic Monthly"
-        const val VPN = "VPN Monthly"
-        const val BASIC_VPN = "Basic + VPN Monthly"
-    }
+    val PRODUCTS_LIST = listOf(BASIC, BASIC_PLUS_VPN, VPN)
 
+    /**
+     * Maps a subscribed product to the ones to which the user can upgrade
+     */
+    val UPGRADE_MAP = mapOf(
+            BASIC to setOf(BASIC_PLUS_VPN),
+            VPN to setOf(BASIC_PLUS_VPN),
+            BASIC_PLUS_VPN to emptySet())
+            .withDefault { setOf(BASIC, VPN, BASIC_PLUS_VPN) }
 }
+
+internal object ProductName {
+    const val BASIC = "Basic Monthly"
+    const val VPN = "VPN Monthly"
+    const val BASIC_VPN = "Basic + VPN Monthly"
+}
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/productlist/ProductListAdapter.kt b/app/src/lumen/java/com/cliqz/browser/purchases/productlist/ProductListAdapter.kt
index ec98273f5..36f7f13ff 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/productlist/ProductListAdapter.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/productlist/ProductListAdapter.kt
@@ -6,7 +6,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.cliqz.browser.R
-import com.cliqz.browser.purchases.SubscriptionConstants.ProductId
+import com.cliqz.browser.purchases.Products
+import com.cliqz.browser.purchases.Products.UPGRADE_MAP
 import kotlinx.android.synthetic.lumen.subscription_product_row_default.view.*
 
 interface OnBuyClickListener {
@@ -17,11 +18,12 @@ const val LAYOUT_DEFAULT = 0
 const val LAYOUT_HIGHLIGHTED = 1
 
 class ProductListAdapter(private val context: Context?,
-                         private var mListData: List<ProductRowData>?,
                          private val onBuyClickListener: OnBuyClickListener) :
         RecyclerView.Adapter<ProductListAdapter.ProductRowViewHolder>() {
 
-    private var hasSubscription = false
+    private var subscription: ProductRowData? = null
+
+    private var mListData = emptyList<ProductRowData>()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ProductRowViewHolder {
         val layoutResource = when (viewType) {
@@ -33,7 +35,7 @@ class ProductListAdapter(private val context: Context?,
                 .inflate(layoutResource, parent, false))
     }
 
-    override fun getItemCount() = mListData?.size ?: 0
+    override fun getItemCount() = mListData.size
 
     override fun onBindViewHolder(holder: ProductRowViewHolder, position: Int) {
         holder.bindData(getProduct(position))
@@ -46,23 +48,21 @@ class ProductListAdapter(private val context: Context?,
     }
 
     override fun getItemViewType(position: Int): Int {
-        return mListData?.let {
-            if (it[position].sku in setOf(ProductId.BASIC_VPN, ProductId.BASIC_VPN_STAGING)) {
+        return if (mListData[position].sku == Products.BASIC_PLUS_VPN) {
                 LAYOUT_HIGHLIGHTED
             } else {
                 LAYOUT_DEFAULT
             }
-        } ?: LAYOUT_DEFAULT
     }
 
-    fun getProduct(position: Int) = mListData?.get(position)
+    fun getProduct(position: Int) = mListData[position]
 
     fun updateProductList(data: List<ProductRowData>) {
         mListData = data
     }
 
-    fun setHasSubscription(hasSubscription: Boolean) {
-        this.hasSubscription = hasSubscription
+    fun setSubscription(subscription: ProductRowData?) {
+        this.subscription = subscription
     }
 
     inner class ProductRowViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
@@ -77,16 +77,23 @@ class ProductListAdapter(private val context: Context?,
                 itemView.title.text = title
                 itemView.description.text = description
                 itemView.price.text = context?.getString(R.string.per_month_text, price)
-                if (this@ProductListAdapter.hasSubscription) {
-                    if (this.isSubscribed) {
+                val subscription = this@ProductListAdapter.subscription
+                when {
+                    subscription == null -> {
+                        itemView.is_subscribed?.visibility = View.GONE
+                        itemView.buy_subscription.visibility = View.VISIBLE
+                    }
+                    this.isSubscribed -> {
                         itemView.is_subscribed?.visibility = View.VISIBLE
                         itemView.buy_subscription.visibility = View.GONE
-                    } else {
+                    }
+                    UPGRADE_MAP[subscription.sku]?.contains(this.sku) ?: false -> {
                         itemView.buy_subscription.text = context?.getString(R.string.upgrade_button)
                     }
-                } else {
-                    itemView.is_subscribed?.visibility = View.GONE
-                    itemView.buy_subscription.visibility = View.VISIBLE
+                    else -> {
+                        itemView.is_subscribed?.visibility = View.GONE
+                        itemView.buy_subscription.visibility = View.GONE
+                    }
                 }
             }
         }

From 8a99479f559bb38b49e8308d2be06cac70688187 Mon Sep 17 00:00:00 2001
From: ravjit-cliqz <ravjit@cliqz.com>
Date: Wed, 17 Jul 2019 10:10:06 +0200
Subject: [PATCH 42/57] AP-353 AP-414 Vpn countries localisation and ordering
 (#168)

---
 .../purchases/trial/TrialPeriodRemoteRepo.kt  |  5 ++
 .../com/cliqz/browser/vpn/VpnCountries.java   | 48 +++++++++++++++++
 .../java/com/cliqz/browser/vpn/VpnPanel.java  | 54 ++++++++++++++-----
 app/src/lumen/res/values/strings.xml          | 24 +++++++++
 4 files changed, 117 insertions(+), 14 deletions(-)
 create mode 100644 app/src/lumen/java/com/cliqz/browser/vpn/VpnCountries.java

diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt b/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt
index 66ca356d4..38078aa34 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/trial/TrialPeriodRemoteRepo.kt
@@ -9,6 +9,7 @@ import com.cliqz.browser.CliqzConfig
 import com.cliqz.browser.app.BrowserApp
 import com.cliqz.browser.main.Messages
 import com.cliqz.browser.utils.HttpHandler
+import com.cliqz.browser.vpn.VpnCountries
 import com.cliqz.nove.Bus
 import com.revenuecat.purchases.Purchases
 import de.blinkt.openvpn.ConfigConverter
@@ -97,6 +98,10 @@ class TrialPeriodRemoteRepo(private val context: Context,
                 //No use of posting this message unless all profiles have been imported
                 if (totalProfiles == ProfileManager.getInstance(context).profiles.size) {
                     bus.post(Messages.OnAllProfilesImported())
+                    for (vpnProfile in ProfileManager.getInstance(context).profiles) {
+                        vpnProfile.profileNameRes = VpnCountries.getCountryName(vpnProfile.name)
+                        ProfileManager.getInstance(context).saveProfile(context, vpnProfile)
+                    }
                 }
             }
             configConverter.startImportTask(vpnConfigUri, countryCode)
diff --git a/app/src/lumen/java/com/cliqz/browser/vpn/VpnCountries.java b/app/src/lumen/java/com/cliqz/browser/vpn/VpnCountries.java
new file mode 100644
index 000000000..845ce409b
--- /dev/null
+++ b/app/src/lumen/java/com/cliqz/browser/vpn/VpnCountries.java
@@ -0,0 +1,48 @@
+package com.cliqz.browser.vpn;
+
+import androidx.annotation.StringRes;
+
+import com.cliqz.browser.R;
+
+/**
+ * @author Ravjit Uppal
+ */
+public enum VpnCountries {
+
+    AT(R.string.vpn_austria),
+    BA(R.string.vpn_bosnia),
+    BG(R.string.vpn_bulgaria),
+    CA(R.string.vpn_canada),
+    DE(R.string.vpn_germany),
+    ES(R.string.vpn_spain),
+    FR(R.string.vpn_france),
+    GR(R.string.vpn_greece),
+    HR(R.string.vpn_croatia),
+    HU(R.string.vpn_hungary),
+    IN(R.string.vpn_india),
+    IT(R.string.vpn_italy),
+    NL(R.string.vpn_netherlands),
+    PL(R.string.vpn_poland),
+    PT(R.string.vpn_portugal),
+    RO(R.string.vpn_romania),
+    RS(R.string.vpn_serbia),
+    TR(R.string.vpn_turkey),
+    UA(R.string.vpn_ukraine),
+    UK(R.string.vpn_uk),
+    US(R.string.vpn_usa),
+    VN(R.string.vpn_vietnam);
+
+    public final @StringRes int countryName;
+
+    VpnCountries(@StringRes int countryName) {
+        this.countryName = countryName;
+    }
+
+    public static @StringRes int getCountryName(String value) {
+        try {
+            return VpnCountries.valueOf(value).countryName;
+        } catch (IllegalArgumentException e) {
+            return 0;
+        }
+    }
+}
diff --git a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
index 667a853af..1a88ffb73 100644
--- a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
+++ b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
@@ -4,7 +4,6 @@
 import android.animation.ValueAnimator;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.content.Context;
 import android.graphics.Paint;
 import android.graphics.drawable.RotateDrawable;
 import android.os.Bundle;
@@ -38,7 +37,8 @@
 import com.cliqz.nove.Subscribe;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 
 import javax.inject.Inject;
 
@@ -115,7 +115,6 @@ public static VpnPanel create(View source) {
         final Bundle arguments = new Bundle();
         arguments.putInt(KEY_ANCHOR_HEIGHT, source.getHeight());
         dialog.setArguments(arguments);
-        dialog.setSelectedProfile(source.getContext());
         return dialog;
     }
 
@@ -133,6 +132,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             mAnchorHeight = arguments.getInt(KEY_ANCHOR_HEIGHT, 0);
         }
         bus.register(this);
+        setSelectedProfile();
     }
 
     @Override
@@ -168,9 +168,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         super.onViewCreated(view, savedInstanceState);
         ButterKnife.bind(this, view);
         if (selectedProfile == null) {
-            mSelectedCountry.setText("US");
+            mSelectedCountry.setText(R.string.germany);
         } else {
-            mSelectedCountry.setText(selectedProfile.getName());
+            mSelectedCountry.setText(selectedProfile.profileNameRes);
         }
         mSelectedCountry.setPaintFlags(mSelectedCountry.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
 
@@ -233,15 +233,16 @@ void learnMoreClicked() {
     private void showVpnCountriesDialog() {
         final AlertDialog.Builder mBuilder = new AlertDialog.Builder(getContext());
         final ArrayList<VpnProfile> vpnProfiles = new ArrayList<>(ProfileManager.getInstance(getContext()).getProfiles());
+        Collections.sort(vpnProfiles, vpnListComparator);
         final String[] vpnCountryNames = new String[vpnProfiles.size()];
         for (int i = 0; i < vpnProfiles.size();  i++) {
-            vpnCountryNames[i] = vpnProfiles.get(i).getName();
+            vpnCountryNames[i] = getString(vpnProfiles.get(i).profileNameRes);
         }
         mBuilder.setTitle("Choose an item");
         mBuilder.setSingleChoiceItems(vpnCountryNames, checkedItem, (dialogInterface, i) -> {
             checkedItem =  i;
             selectedProfile = vpnProfiles.get(i);
-            mSelectedCountry.setText(selectedProfile.getName());
+            mSelectedCountry.setText(selectedProfile.profileNameRes);
             dialogInterface.dismiss();
             vpnHandler.disconnectVpn();
             vpnHandler.connectVpn(selectedProfile);
@@ -360,18 +361,25 @@ private void vpnMsgsChangeDrawable(@DrawableRes int id) {
         DrawableExtensionsKt.drawableStart(mVpnMsgLineTwo, id);
     }
 
-    private void setSelectedProfile(Context context) {
-        final Collection<VpnProfile> vpnProfiles =
-                ProfileManager.getInstance(context).getProfiles();
-        if (vpnProfiles != null && !vpnProfiles.isEmpty()) {
-            selectedProfile = vpnProfiles.iterator().next();
+    private void setSelectedProfile() {
+        final ArrayList<VpnProfile> vpnProfiles =
+                new ArrayList<>(ProfileManager.getInstance(getContext()).getProfiles());
+        if (!vpnProfiles.isEmpty()) {
+            Collections.sort(vpnProfiles, vpnListComparator);
+            if (VpnStatus.isVPNConnected()) {
+                selectedProfile = ProfileManager.get(getContext(), VpnStatus.getLastConnectedVPNProfile());
+                checkedItem = vpnProfiles.indexOf(selectedProfile);
+            } else {
+                selectedProfile = vpnProfiles.get(0);
+                checkedItem = 0;
+            }
         }
     }
 
     @Subscribe
     public void onAllProfilesImported(Messages.OnAllProfilesImported onAllProfilesImported) {
-        setSelectedProfile(getDialog().getContext());
-        mSelectedCountry.setText(selectedProfile.getName());
+        setSelectedProfile();
+        mSelectedCountry.setText(selectedProfile.profileNameRes);
         mVpnCtaTitle.setText(R.string.vpn_cta_enabled);
     }
 
@@ -379,4 +387,22 @@ public void onAllProfilesImported(Messages.OnAllProfilesImported onAllProfilesIm
     void dismissVpnPanel(Messages.DismissVpnPanel event) {
         dismissAllowingStateLoss();
     }
+
+    private Comparator<VpnProfile> vpnListComparator = (v1, v2) -> {
+        final String country1 = getString(v1.profileNameRes);
+        final String country2 = getString(v2.profileNameRes);
+        if (v1.profileNameRes == R.string.vpn_usa && v2.profileNameRes == R.string.vpn_germany) {
+            return 1;
+        }
+        if (v1.profileNameRes == R.string.vpn_germany && v2.profileNameRes == R.string.vpn_usa) {
+            return -1;
+        }
+        if (v1.profileNameRes == R.string.vpn_usa || v1.profileNameRes == R.string.vpn_germany) {
+            return -1;
+        }
+        if (v2.profileNameRes == R.string.vpn_usa || v2.profileNameRes == R.string.vpn_germany) {
+            return 1;
+        }
+        return country1.compareTo(country2);
+    };
 }
\ No newline at end of file
diff --git a/app/src/lumen/res/values/strings.xml b/app/src/lumen/res/values/strings.xml
index 0aca4ad18..8541b1c09 100644
--- a/app/src/lumen/res/values/strings.xml
+++ b/app/src/lumen/res/values/strings.xml
@@ -95,6 +95,30 @@
     <string name="vpn_cta_enabled">VPN is short for Virtual Private Network.</string>
     <string name="vpn_notification_title">Lumen Browser - VPN</string>
     <string name="vpn_notification_content">You are connected to %s</string>
+    
+    <!-- VPN VpnCountries -->
+    <string name="vpn_austria">Austria</string>
+    <string name="vpn_bosnia">Bosnia</string>
+    <string name="vpn_bulgaria">Bulgaria</string>
+    <string name="vpn_canada">Canada</string>
+    <string name="vpn_germany">Germany</string>
+    <string name="vpn_spain">Spain</string>
+    <string name="vpn_france">France</string>
+    <string name="vpn_greece">Greece</string>
+    <string name="vpn_croatia">Croatia</string>
+    <string name="vpn_hungary">Hungary</string>
+    <string name="vpn_india">India</string>
+    <string name="vpn_italy">Italy</string>
+    <string name="vpn_netherlands">Netherlands</string>
+    <string name="vpn_poland">Poland</string>
+    <string name="vpn_portugal">Portugal</string>
+    <string name="vpn_romania">Romania</string>
+    <string name="vpn_serbia">Serbia</string>
+    <string name="vpn_turkey">Turkey</string>
+    <string name="vpn_ukraine">Ukraine</string>
+    <string name="vpn_uk">UK</string>
+    <string name="vpn_usa">USA</string>
+    <string name="vpn_vietnam">Vietnam</string>
 
     <!-- Subscription -->
     <string name="button_buy_subscription">Subscribe</string>

From 15a5ef34b2d2a49c01ad27e0ef1acd2344956e57 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Wed, 17 Jul 2019 12:26:50 +0200
Subject: [PATCH 43/57] AB-413 adds german translations for the VPN panel
 (#171)

---
 .../java/com/cliqz/browser/purchases/PurchaseFragment.kt    | 4 +++-
 app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java      | 6 ++----
 app/src/lumen/res/layout/home_vpn_panel.xml                 | 3 ++-
 app/src/lumen/res/values-de/strings.xml                     | 3 +++
 app/src/lumen/res/values/strings.xml                        | 3 +++
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
index 5142d6377..463e5f528 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
@@ -200,7 +200,9 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
                 },
                 onSuccess = { purchase, _ ->
                     enableFeatures(purchase.sku)
-                    Toast.makeText(context, "Purchase complete!", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(context,
+                            getString(R.string.purchase_message_complete),
+                            Toast.LENGTH_SHORT).show()
                 }
         )
     }
diff --git a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
index 1a88ffb73..259fc986f 100644
--- a/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
+++ b/app/src/lumen/java/com/cliqz/browser/vpn/VpnPanel.java
@@ -64,7 +64,6 @@ public class VpnPanel extends DialogFragment implements VpnStatus.StateListener
     public static final int VPN_LAUNCH_REQUEST_CODE = 70;
 
     private int mAnchorHeight;
-    private boolean mSaveInstanceStateCalled = false;
 
     private Handler mMainHandler;
     private boolean mShouldAnimate = false;
@@ -139,7 +138,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     public void onResume() {
         super.onResume();
         vpnHandler.onResume();
-        mSaveInstanceStateCalled = false;
         final Window window = getDialog().getWindow();
         final Activity activity = getActivity();
         final View contentView = activity != null ? activity.findViewById(android.R.id.content) : null;
@@ -333,7 +331,7 @@ private void updateStateToConnected() {
         mVpnTimer.setVisibility(View.VISIBLE);
         mVpnTimer.setBase(SystemClock.elapsedRealtime() - (System.currentTimeMillis() - preferenceManager.getVpnStartTime()));
         mVpnTimer.start();
-        mVpnButtonDesc.setText("disconnect");
+        mVpnButtonDesc.setText(R.string.vpn_action_disconnect);
         mVpnConnectButton.setBackground(getResources().getDrawable(R.drawable.vpn_connect_button_bg));
         mWorldMap.setImageResource(R.drawable.vpn_map_on);
         vpnMsgsChangeDrawable(R.drawable.ic_check);
@@ -345,7 +343,7 @@ private void updateStateToConnect() {
         mVpnTimer.setVisibility(View.GONE);
         mVpnButtonTitle.setVisibility(View.VISIBLE);
         mVpnButtonTitle.setText("vpn");
-        mVpnButtonDesc.setText("connect");
+        mVpnButtonDesc.setText(R.string.vpn_action_connect);
         mVpnConnectButton.setBackground(getResources().getDrawable(R.drawable.vpn_connect_button_bg));
         mWorldMap.setImageResource(R.drawable.vpn_map_off);
         vpnMsgsChangeDrawable(R.drawable.ic_cross);
diff --git a/app/src/lumen/res/layout/home_vpn_panel.xml b/app/src/lumen/res/layout/home_vpn_panel.xml
index 56a5bced7..43d8c5902 100644
--- a/app/src/lumen/res/layout/home_vpn_panel.xml
+++ b/app/src/lumen/res/layout/home_vpn_panel.xml
@@ -77,7 +77,8 @@
             android:layout_height="wrap_content"
             android:textAllCaps="true"
             android:textColor="@android:color/white"
-            android:textSize="20sp" />
+            android:textSize="20sp"
+            tools:text="Connect"/>
 
         <Chronometer
             android:id="@+id/vpn_timer"
diff --git a/app/src/lumen/res/values-de/strings.xml b/app/src/lumen/res/values-de/strings.xml
index 177a2315c..e659c4759 100644
--- a/app/src/lumen/res/values-de/strings.xml
+++ b/app/src/lumen/res/values-de/strings.xml
@@ -102,4 +102,7 @@
     <string name="restore_subscription_dialog_positive_btn">Wiederherstellen</string>
     <string name="restore_subscription_error_msg">Kein Abo vorhanden</string>
     <string name="restore_subscription_success">Abo wiederhergestellt</string>
+    <string name="purchase_message_complete">Kauf abgeschlossen!</string>
+    <string name="vpn_action_disconnect">Trennen</string>
+    <string name="vpn_action_connect">Verbinden</string>
 </resources>
diff --git a/app/src/lumen/res/values/strings.xml b/app/src/lumen/res/values/strings.xml
index 8541b1c09..5a560d03b 100644
--- a/app/src/lumen/res/values/strings.xml
+++ b/app/src/lumen/res/values/strings.xml
@@ -95,6 +95,8 @@
     <string name="vpn_cta_enabled">VPN is short for Virtual Private Network.</string>
     <string name="vpn_notification_title">Lumen Browser - VPN</string>
     <string name="vpn_notification_content">You are connected to %s</string>
+    <string name="vpn_action_connect">Connect</string>
+    <string name="vpn_action_disconnect">Disconnect</string>
     
     <!-- VPN VpnCountries -->
     <string name="vpn_austria">Austria</string>
@@ -126,6 +128,7 @@
     <string name="text_subscribed">Subscribed</string>
     <string name="subscription_product_row_highlighted">Best offer\nLimited Time Only</string>
     <string name="per_month_text">%1$s / MONTH</string>
+    <string name="purchase_message_complete">Purchase complete!</string>
 
     <!-- Restore Subscription -->
     <string name="restore_subscription">Restore Subscription</string>

From 1c408c8edcfdbb78217c794c5e5afc87b351c888 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Wed, 17 Jul 2019 17:13:54 +0200
Subject: [PATCH 44/57] Better products filtering (#173)

---
 .../browser/purchases/PurchaseFragment.kt     | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
index 463e5f528..c6d4c663e 100644
--- a/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
+++ b/app/src/lumen/java/com/cliqz/browser/purchases/PurchaseFragment.kt
@@ -82,20 +82,24 @@ class PurchaseFragment : DialogFragment(), OnBuyClickListener {
     private fun getProductDetails() {
         Purchases.sharedInstance.getEntitlements(object : ReceiveEntitlementsListener {
             override fun onReceived(entitlementMap: Map<String, Entitlement>) {
-                val entitlement = entitlementMap[Entitlements.PREMIUM_SALE] ?: entitlementMap[Entitlements.PREMIUM_SALE_STAGING]
-
-                val productSet = entitlement?.offerings?.map { (_, offering) ->
-                    offering.activeProductIdentifier to offering.skuDetails
-                }?.toMap() ?: emptyMap()
-                val productList = PRODUCTS_LIST
-                        .mapNotNull { sku -> productSet[sku] }
-                        .map { ProductRowData(
-                                it.sku,
-                                it.title,
-                                it.price,
-                                it.description,
-                                it.sku == purchasesManager.purchase.sku
-                        )}
+                val entitlement =
+                        entitlementMap[Entitlements.PREMIUM_SALE] ?:
+                        entitlementMap[Entitlements.PREMIUM_SALE_STAGING]
+
+                val productSet = (entitlement?.offerings ?: emptyMap())
+                        .map { (_, off) -> off.activeProductIdentifier to off.skuDetails }
+                        .toMap()
+                val productList = PRODUCTS_LIST.mapNotNull { sku ->
+                    productSet[sku]?.let { detail ->
+                        ProductRowData(
+                                detail.sku,
+                                detail.title,
+                                detail.price,
+                                detail.description,
+                                detail.sku == purchasesManager.purchase.sku
+                        )
+                    }
+                }
                 val subscription = productList.find { it.isSubscribed }
 
                 if (productList.isEmpty()) {

From 3fd22fffc6ee748ee6fc28f5d8994289609a1272 Mon Sep 17 00:00:00 2001
From: ravjit-cliqz <ravjit@cliqz.com>
Date: Wed, 17 Jul 2019 17:15:02 +0200
Subject: [PATCH 45/57] AP-345 AP-346 AP-347 fix double api calls (#174)

---
 .../com/cliqz/browser/app/BrowserApp.java     |  3 ++
 .../com/cliqz/browser/app/BrowserApp.java     | 28 +++++++++++++++++--
 .../com/cliqz/browser/app/BaseBrowserApp.java |  9 +++---
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/app/src/cliqz/java/com/cliqz/browser/app/BrowserApp.java b/app/src/cliqz/java/com/cliqz/browser/app/BrowserApp.java
index 8d638fbd2..d6d4e13a0 100644
--- a/app/src/cliqz/java/com/cliqz/browser/app/BrowserApp.java
+++ b/app/src/cliqz/java/com/cliqz/browser/app/BrowserApp.java
@@ -4,5 +4,8 @@ public class BrowserApp extends BaseBrowserApp {
 
     @Override
     public void init() {
+        //intialize common libraries
+        super.init();
+        //initialize flavour specific libraries below iff any
     }
 }
\ No newline at end of file
diff --git a/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java b/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java
index 2da52195b..aefadc183 100644
--- a/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java
+++ b/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java
@@ -1,15 +1,19 @@
 package com.cliqz.browser.app;
 
+import android.app.ActivityManager;
+import android.content.Context;
+
 import com.cliqz.browser.BuildConfig;
 import com.cliqz.browser.CliqzConfig;
 import com.cliqz.browser.purchases.PurchasesManager;
 import com.revenuecat.purchases.Purchases;
+
+import javax.inject.Inject;
+
 import de.blinkt.openvpn.core.StatusListener;
 import io.sentry.Sentry;
 import io.sentry.android.AndroidSentryClientFactory;
 
-import javax.inject.Inject;
-
 /**
  * @author Ravjit Uppal
  */
@@ -20,8 +24,16 @@ public class BrowserApp extends BaseBrowserApp {
 
     @Override
     public void init() {
+        //We need the listener in both the processes
         final StatusListener mStatus = new StatusListener();
         mStatus.init(getApplicationContext());
+        //If it's the vpn process we don't need to initialize any other library
+        if (isVpnProcess()) {
+            return;
+        }
+        //Initialize common libraries
+        super.init();
+        //Initialize flavour specific libraries
         setupCrashReporting();
         getAppComponent().inject(this);
         setupSubscriptionSDK();
@@ -43,4 +55,16 @@ private void setupSubscriptionSDK() {
         }
     }
 
+    private boolean isVpnProcess() {
+        final ActivityManager manager = (ActivityManager) this.getSystemService(Context.ACTIVITY_SERVICE);
+        for (ActivityManager.RunningAppProcessInfo processInfo : manager.getRunningAppProcesses()) {
+            if (processInfo.pid == android.os.Process.myPid()) {
+                if (processInfo.processName.equals("com.cliqz.lumen:openvpn")) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
 }
diff --git a/app/src/main/java/com/cliqz/browser/app/BaseBrowserApp.java b/app/src/main/java/com/cliqz/browser/app/BaseBrowserApp.java
index 04ecd7998..5ddac5e12 100644
--- a/app/src/main/java/com/cliqz/browser/app/BaseBrowserApp.java
+++ b/app/src/main/java/com/cliqz/browser/app/BaseBrowserApp.java
@@ -29,19 +29,18 @@ public BaseBrowserApp() {
         sBaseBrowserApp = this;
     }
 
-    /**
-     * All the flavour specific library initializations should be done here.
-     */
-    public abstract void init();
 
     @Override
     public void onCreate() {
         super.onCreate();
+        init();
+    }
+
+    void init() {
         Fresco.initialize(this);
         buildDepencyGraph();
         installSupportLibraries();
         sTestInProgress = testInProgres();
-        init();
     }
 
     /**

From ef31fd95cc47d7d664a5098c0251cde3943e5c40 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Fri, 14 Jun 2019 14:40:55 +0200
Subject: [PATCH 46/57] Initial buildSrc support

---
 buildSrc/build.gradle                         |  7 +-
 .../main/java/com/cliqz/gradle/CliqzPlugin.kt | 71 +------------------
 settings.gradle                               |  4 ++
 3 files changed, 7 insertions(+), 75 deletions(-)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 91be46e16..0b677f8c1 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -3,22 +3,17 @@ plugins {
 }
 repositories {
     mavenCentral()
-    google()
 }
-
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "com.android.tools.build:gradle:3.4.1"
 }
-
 compileKotlin {
     kotlinOptions {
         jvmTarget = "1.8"
     }
 }
-
 compileTestKotlin {
     kotlinOptions {
         jvmTarget = "1.8"
     }
-}
\ No newline at end of file
+}
diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
index 2d0c27ce6..cd973be9f 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
@@ -1,77 +1,10 @@
 package com.cliqz.gradle
 
-import com.android.build.OutputFile
-import com.android.build.gradle.AppExtension
-import com.android.build.gradle.api.ApkVariantOutput
-import com.android.build.gradle.api.ApplicationVariant
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
-@Suppress("unused")
 class CliqzPlugin: Plugin<Project> {
     override fun apply(project: Project) {
-        // TODO: Can this be moved to afterEvaluate too?
-        val android = project.property("android") as AppExtension
-        android.productFlavors.names.forEach {
-            android.defaultConfig.apply {
-                val upperName = it.toUpperCase()
-                buildConfigField("String", "FLAVOR_$upperName", "\"$it\"")
-                buildConfigField("boolean", "IS_$upperName", "FLAVOR.equals(FLAVOR_$upperName)")
-                buildConfigField("boolean", "IS_NOT_$upperName", "!IS_$upperName")
-            }
-        }
-
-        project.afterEvaluate {
-            android.applicationVariants.forEach { variant ->
-                setVersionCode(variant)
-                createCliqzConfigTasks(project, variant)
-            }
-        }
-    }
-
-    private fun createCliqzConfigTasks(project: Project, variant: ApplicationVariant) {
-        val buildConfigProvider = variant.generateBuildConfigProvider
-        val javaCompileProvider = variant.javaCompileProvider
-        // val sourceOutdir = buildConfig.sourceOutputDir
-        val taskName = "generate${variant.name.capitalize()}CliqzConfig"
-        // val packageName = buildConfig.buildConfigPackageName
-        val builtType = variant.buildType.name
-        // This generate possible config names to look for in the json
-        val flavorNames = variant.productFlavors.fold(emptySet<String>()) { acc, productFlavor ->
-            acc + (listOf(productFlavor.name, "${productFlavor.name}${builtType.capitalize()}", builtType))
-        }
-
-        val taskProvider = project.tasks.register(taskName, CliqzConfigTask::class.java, buildConfigProvider, flavorNames)
-        taskProvider.configure {
-            it.dependsOn(buildConfigProvider)
-        }
-        project.tasks.named("compile${variant.name.capitalize()}Kotlin").configure {
-            it.dependsOn(taskProvider)
-        }
-        javaCompileProvider.configure {
-            it.dependsOn(taskProvider)
-        }
-    }
-
-    private fun setVersionCode(variant: ApplicationVariant) {
-        val buildNumber = System.getenv("BUILD_NUMBER")?.toIntOrNull()
-        if (buildNumber == null) return;
-        val versionCode = 150 + buildNumber
-        val apiVersion = variant.productFlavors[0].versionCode
-        variant.outputs.forEach { output ->
-            val abi = output.filters.find { it.filterType == OutputFile.ABI }
-            abi?.let {
-                val abiVersion = ABI_CODES[it.identifier]
-                (output as ApkVariantOutput).versionCodeOverride =
-                        versionCode * 100 + apiVersion * 10 + abiVersion!!
-            }
-        }
-    }
-
-
-
-    companion object {
-        private val ABI_CODES = mapOf(
-                "armeabi-v7a" to 2, "arm64-v8a" to 4, "x86" to 6, "x86_64" to 8)
+        System.out.println(project::class.toString())
     }
-}
\ No newline at end of file
+}
diff --git a/settings.gradle b/settings.gradle
index 46c7e2771..0da3df933 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,4 +16,8 @@ include ':react-native-share'
 project(':react-native-share').projectDir = new File(settingsDir, 	'node_modules/react-native-share/android')
 
 include ':react-native-user-agent-react-native-user-agent'
+<<<<<<< HEAD
 project(':react-native-user-agent-react-native-user-agent').projectDir = new File(settingsDir, 'node_modules/react-native-user-agent/android')
+=======
+project(':react-native-user-agent-react-native-user-agent').projectDir = new File(settingsDir, 	'node_modules/react-native-user-agent/android')
+>>>>>>> Initial buildSrc support

From 1b88c0e615777a93f188ea6f268fda9ba1413325 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Wed, 19 Jun 2019 16:00:45 +0200
Subject: [PATCH 47/57] buildSrc: remove versioning and flavor related
 BuildConfig fields

---
 app/build.gradle                              |  3 --
 buildSrc/build.gradle                         |  5 +++
 .../main/java/com/cliqz/gradle/CliqzPlugin.kt | 36 ++++++++++++++++++-
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1c8bb310a..0f3e72d07 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -111,9 +111,6 @@ android {
             universalApk false
         }
     }
-    testOptions {
-        animationsDisabled = true
-    }
 }
 
 dexcount {
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 0b677f8c1..2d110ee00 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -3,15 +3,20 @@ plugins {
 }
 repositories {
     mavenCentral()
+    google()
 }
+
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    implementation "com.android.tools.build:gradle:3.4.1"
 }
+
 compileKotlin {
     kotlinOptions {
         jvmTarget = "1.8"
     }
 }
+
 compileTestKotlin {
     kotlinOptions {
         jvmTarget = "1.8"
diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
index cd973be9f..2310532a3 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
@@ -1,10 +1,44 @@
 package com.cliqz.gradle
 
+import com.android.build.OutputFile
+import com.android.build.gradle.AppExtension
+import com.android.build.gradle.api.ApkVariantOutput
+import org.gradle.api.DefaultTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
+@Suppress("unused")
 class CliqzPlugin: Plugin<Project> {
     override fun apply(project: Project) {
-        System.out.println(project::class.toString())
+        val android = project.property("android") as AppExtension
+        android.productFlavors.names.forEach {
+            android.defaultConfig.apply {
+                val upperName = it.toUpperCase()
+                buildConfigField("String", "FLAVOR_$upperName", "\"$it\"")
+                buildConfigField("boolean", "IS_$upperName", "FLAVOR.equals(FLAVOR_$upperName)")
+                buildConfigField("boolean", "IS_NOT_$upperName", "!IS_$upperName")
+            }
+        }
+
+        val preBuild = project.property("preBuild") as DefaultTask
+        val defaultVersionCode = android.defaultConfig.versionCode
+        preBuild.doLast {
+            android.applicationVariants.forEach { variant ->
+                val apiVersion = variant.productFlavors[0].versionCode
+                variant.outputs.forEach { output ->
+                    val abi = output.filters.find { it.filterType == OutputFile.ABI }
+                    abi?.let {
+                        val abiVersion = ABI_CODES[it.identifier]
+                        (output as ApkVariantOutput).versionCodeOverride =
+                                defaultVersionCode * 100 + apiVersion * 10 + abiVersion!!
+                    }
+                }
+            }
+        }
+    }
+
+    companion object {
+        private val ABI_CODES = mapOf(
+                "armeabi-v7a" to 2, "arm64-v8a" to 4, "x86" to 6, "x86_64" to 8)
     }
 }

From ee7f14fee40a4422384e002141291eacc0cd3e95 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Mon, 24 Jun 2019 17:17:01 +0200
Subject: [PATCH 48/57] Removing scripts/CliqzConfig.gradle

---
 .../java/com/cliqz/gradle/CliqzConfigTask.kt  | 71 ++++++-------------
 .../main/java/com/cliqz/gradle/CliqzPlugin.kt | 52 ++++++++++----
 2 files changed, 60 insertions(+), 63 deletions(-)

diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
index 5659d778a..5f7869f67 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
@@ -6,8 +6,8 @@ import com.google.gson.reflect.TypeToken
 import com.squareup.javawriter.JavaWriter
 import org.gradle.api.DefaultTask
 import org.gradle.api.logging.Logger
-import org.gradle.api.tasks.*
-import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.TaskProvider
 import java.io.File
 import java.io.FileReader
 import java.io.FileWriter
@@ -21,33 +21,12 @@ open class CliqzConfigTask @Inject constructor(
         val buildConfigProvider: TaskProvider<GenerateBuildConfig>,
         val flavorNames: Set<String>) : DefaultTask() {
 
-    val inputFile: File? by lazy {
-        val inFile = project.file(CLIQZ_CONFIG_JSON)
-        if (inFile.isFile) inFile else null
-    }
-        @Optional @InputFile get
-
-    private val buildConfigTask: GenerateBuildConfig by lazy { buildConfigProvider.get() }
-    private val packageName: String by lazy { buildConfigTask.buildConfigPackageName }
-
-    val outputDirectory: File by lazy {
-        File(buildConfigTask.sourceOutputDir, packageName.replace('.', File.separatorChar))
-    }
-        @OutputDirectory get
-
-    val outputFile: File by lazy {
-        File(outputDirectory, "CliqzConfig.java")
-    }
-        @OutputFile get
-
     @TaskAction
     fun generateCliqzConfig() {
         // Read the json file
+        val configFile = project.file(CLIQZ_CONFIG_JSON)
         val type = MapTypeToken().type
-        val config = if (inputFile == null) {
-            logger.warn("Missing $CLIQZ_CONFIG_JSON")
-            Config()
-        } else FileReader(inputFile).use {
+        val config = FileReader(configFile).use {
             val configs = Gson().fromJson<Map<String, Config>>(it, type)
             val defaultConfig = configs[DEFAULT_CONFIG_KEY] ?: Config()
             val mergedConfig = configs.filter { (key, _) ->
@@ -58,8 +37,12 @@ open class CliqzConfigTask @Inject constructor(
             defaultConfig.merge(mergedConfig)
             return@use defaultConfig
         }
-
-        FileWriter(outputFile).use { writer ->
+        val builConfigTask = buildConfigProvider.get()
+        val generatedSourceDir = builConfigTask.sourceOutputDir
+        val packageName = builConfigTask.buildConfigPackageName
+        val outDir = File(generatedSourceDir, packageName.replace('.', File.separatorChar))
+        val outFile = File(outDir, "CliqzConfig.java")
+        FileWriter(outFile).use { writer ->
             val javaWriter = JavaWriter(writer)
             javaWriter.emitJavadoc("Auto generated, do not edit")
                     .emitPackage(packageName)
@@ -93,8 +76,6 @@ open class CliqzConfigTask @Inject constructor(
 }
 private class MapTypeToken: TypeToken<Map<String, Config>>()
 
-// All the properties are only used via reflection, so they are "unused"
-@Suppress("unused")
 class Config {
     var amazonAccountID = ""
     var amazonAuthRoleARN = ""
@@ -102,38 +83,26 @@ class Config {
     var amazonIdentityPoolID = ""
     var amazonApplicationARN = ""
     var amazonSnsTopics = mutableListOf<String>()
-    var vpnApiKey = ""
-    var revenuecatApiKey = ""
-    var sentryToken = ""
-    var credentialUrl = ""
 
-    @Suppress("UNCHECKED_CAST")
     fun merge(other: Config, logger: Logger? = null): Config {
-        Config::class.declaredMemberProperties.forEach { member ->
-            when (member.returnType.classifier) {
-                String::class -> mergeStringProperty(logger, other, member as KMutableProperty1<Config, String>)
-                MutableList::class -> mergeListProperty(other, member as KMutableProperty1<Config, List<String>>)
-                else -> logger?.error("Can't merge property ${member.name}")
-            }
-        }
+        amazonAccountID = mergeProperty(logger, other, Config::amazonAccountID)
+        amazonAuthRoleARN = mergeProperty(logger, other, Config::amazonAuthRoleARN)
+        amazonUnauthRoleARN = mergeProperty(logger, other, Config::amazonUnauthRoleARN)
+        amazonIdentityPoolID = mergeProperty(logger, other, Config::amazonIdentityPoolID)
+        amazonApplicationARN = mergeProperty(logger, other, Config::amazonApplicationARN)
+        val topics = amazonSnsTopics.toMutableSet()
+        topics.addAll(other.amazonSnsTopics)
+        amazonSnsTopics = topics.toMutableList()
         return this
     }
 
-    private fun mergeListProperty(other: Config, property: KMutableProperty1<Config, List<String>>) {
-        val topics = property.get(this).toMutableSet()
-        topics.addAll(property.get(other))
-        property.set(this, topics.toMutableList())
-    }
-
-    private fun mergeStringProperty(logger: Logger?, other: Config, property: KMutableProperty1<Config, String>) {
+    private fun mergeProperty(logger: Logger?, other: Config, property: KMutableProperty1<Config, String>): String {
         val v1 = property.get(this)
         val v2 = property.get(other)
         if (v1.isNotEmpty() && v2.isNotEmpty()) {
             logger?.warn("Duplicated property ${property.name}")
         }
-        if (v2.isNotEmpty()) {
-            property.set(this, v2)
-        }
+        return if (v2.isNotEmpty()) v2 else v1
     }
 
 }
diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
index 2310532a3..f6cebcf8e 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
@@ -3,13 +3,14 @@ package com.cliqz.gradle
 import com.android.build.OutputFile
 import com.android.build.gradle.AppExtension
 import com.android.build.gradle.api.ApkVariantOutput
-import org.gradle.api.DefaultTask
+import com.android.build.gradle.api.ApplicationVariant
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 
 @Suppress("unused")
 class CliqzPlugin: Plugin<Project> {
     override fun apply(project: Project) {
+        // TODO: Can this be moved to afterEvaluate too?
         val android = project.property("android") as AppExtension
         android.productFlavors.names.forEach {
             android.defaultConfig.apply {
@@ -20,23 +21,50 @@ class CliqzPlugin: Plugin<Project> {
             }
         }
 
-        val preBuild = project.property("preBuild") as DefaultTask
         val defaultVersionCode = android.defaultConfig.versionCode
-        preBuild.doLast {
+        project.afterEvaluate {
             android.applicationVariants.forEach { variant ->
-                val apiVersion = variant.productFlavors[0].versionCode
-                variant.outputs.forEach { output ->
-                    val abi = output.filters.find { it.filterType == OutputFile.ABI }
-                    abi?.let {
-                        val abiVersion = ABI_CODES[it.identifier]
-                        (output as ApkVariantOutput).versionCodeOverride =
-                                defaultVersionCode * 100 + apiVersion * 10 + abiVersion!!
-                    }
-                }
+                setVersionCode(defaultVersionCode, variant)
+                createCliqzConfigTasks(project, variant)
             }
         }
     }
 
+    private fun createCliqzConfigTasks(project: Project, variant: ApplicationVariant) {
+        val buildConfigProvider = variant.generateBuildConfigProvider
+        val javaCompileProvider = variant.javaCompileProvider
+        // val sourceOutdir = buildConfig.sourceOutputDir
+        val taskName = "generate${variant.name.capitalize()}CliqzConfig"
+        // val packageName = buildConfig.buildConfigPackageName
+        val builtType = variant.buildType.name
+        // This generate possible config names to look for in the json
+        val flavorNames = variant.productFlavors.fold(emptySet<String>()) { acc, productFlavor ->
+            acc + (listOf(productFlavor.name, "${productFlavor.name}${builtType.capitalize()}", builtType))
+        }
+
+        val taskProvider = project.tasks.register(taskName, CliqzConfigTask::class.java, buildConfigProvider, flavorNames)
+        taskProvider.configure {
+            it.dependsOn(buildConfigProvider)
+        }
+        javaCompileProvider.configure {
+            it.dependsOn(taskProvider)
+        }
+    }
+
+    private fun setVersionCode(defaultVersionCode: Int, variant: ApplicationVariant) {
+        val apiVersion = variant.productFlavors[0].versionCode
+        variant.outputs.forEach { output ->
+            val abi = output.filters.find { it.filterType == OutputFile.ABI }
+            abi?.let {
+                val abiVersion = ABI_CODES[it.identifier]
+                (output as ApkVariantOutput).versionCodeOverride =
+                        defaultVersionCode * 100 + apiVersion * 10 + abiVersion!!
+            }
+        }
+    }
+
+
+
     companion object {
         private val ABI_CODES = mapOf(
                 "armeabi-v7a" to 2, "arm64-v8a" to 4, "x86" to 6, "x86_64" to 8)

From 137b0cec908089c979946a00681f346881d03987 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Mon, 24 Jun 2019 17:21:57 +0200
Subject: [PATCH 49/57] Cleaning up settings.gradle

---
 settings.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 0da3df933..46c7e2771 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,8 +16,4 @@ include ':react-native-share'
 project(':react-native-share').projectDir = new File(settingsDir, 	'node_modules/react-native-share/android')
 
 include ':react-native-user-agent-react-native-user-agent'
-<<<<<<< HEAD
 project(':react-native-user-agent-react-native-user-agent').projectDir = new File(settingsDir, 'node_modules/react-native-user-agent/android')
-=======
-project(':react-native-user-agent-react-native-user-agent').projectDir = new File(settingsDir, 	'node_modules/react-native-user-agent/android')
->>>>>>> Initial buildSrc support

From 721781eca0825ef47bdd67f15de04942c5a45b38 Mon Sep 17 00:00:00 2001
From: Jayesh Solanki <jayeshsolanki93@gmail.com>
Date: Wed, 19 Jun 2019 16:12:13 +0200
Subject: [PATCH 50/57] Setup Sentry for crash reporting

---
 app/build.gradle                              | 10 ++++++++
 .../com/cliqz/browser/app/BrowserApp.java     | 23 ++++++++++++++-----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0f3e72d07..23df94c58 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -96,6 +96,16 @@ android {
             dimension "api"
             versionCode 8
         }
+        applicationVariants.all { variant ->
+            buildConfigField 'String', 'SENTRY_TOKEN', 'null'
+            if (variant.flavorName == "lumen" && variant.buildType.name == "release") {
+                def sentryToken = this.hasProperty("com.cliqz.lumen.sentryToken") ?
+                        this.getProperty("com.cliqz.lumen.sentryToken") : System.getenv("SENTRY_TOKEN")
+                if (sentryToken) {
+                    buildConfigField 'String', 'SENTRY_TOKEN', "\"${sentryToken}\""
+                }
+            }
+        }
 //        huawei {
 //            dimension "api"
 //            versionCode 5
diff --git a/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java b/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java
index aefadc183..dd09b1db8 100644
--- a/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java
+++ b/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java
@@ -4,12 +4,13 @@
 import android.content.Context;
 
 import com.cliqz.browser.BuildConfig;
-import com.cliqz.browser.CliqzConfig;
 import com.cliqz.browser.purchases.PurchasesManager;
 import com.revenuecat.purchases.Purchases;
 
 import javax.inject.Inject;
 
+import de.blinkt.openvpn.ConfigConverter;
+import de.blinkt.openvpn.core.ProfileManager;
 import de.blinkt.openvpn.core.StatusListener;
 import io.sentry.Sentry;
 import io.sentry.android.AndroidSentryClientFactory;
@@ -35,22 +36,32 @@ public void init() {
         super.init();
         //Initialize flavour specific libraries
         setupCrashReporting();
+
         getAppComponent().inject(this);
         setupSubscriptionSDK();
     }
 
+    //@TODO Remove hardcoded imports once the integration with server is done
+    private void importVpnProfiles() {
+        final ProfileManager profileManager = ProfileManager.getInstance(getApplicationContext());
+        if (profileManager.getProfileByName("austria-vpn") == null) {
+            final Uri usVpnUri = Uri.parse("android.resource://" + getPackageName() + "/raw/austria");
+            final ConfigConverter usConvertor = new ConfigConverter(getApplicationContext());
+            usConvertor.startImportTask(usVpnUri, "austria-vpn");
+        }
+    }
+
     private void setupCrashReporting() {
-        //noinspection ConstantConditions
-        if (!CliqzConfig.SENTRY_TOKEN.isEmpty()) {
-            Sentry.init(CliqzConfig.SENTRY_TOKEN, new AndroidSentryClientFactory(this));
+        if (!TextUtils.isEmpty(BuildConfig.SENTRY_TOKEN)) {
+            Sentry.init(BuildConfig.SENTRY_TOKEN, new AndroidSentryClientFactory(this));
         }
     }
 
     private void setupSubscriptionSDK() {
         //noinspection ConstantConditions
-        if (!CliqzConfig.REVENUECAT_API_KEY.isEmpty()) {
+        if (!BuildConfig.REVENUECAT_API_KEY.isEmpty()) {
             Purchases.setDebugLogsEnabled(BuildConfig.DEBUG);
-            Purchases.configure(this, CliqzConfig.REVENUECAT_API_KEY);
+            Purchases.configure(this, BuildConfig.REVENUECAT_API_KEY);
             purchasesManager.checkPurchases();
         }
     }

From 45b788ee21f75752bfddc47e638f67901bb1db69 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Tue, 25 Jun 2019 11:34:32 +0200
Subject: [PATCH 51/57] Incremental builds

---
 .../java/com/cliqz/gradle/CliqzConfigTask.kt  | 59 +++++++++++++------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
index 5f7869f67..2831a92b3 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
@@ -6,8 +6,7 @@ import com.google.gson.reflect.TypeToken
 import com.squareup.javawriter.JavaWriter
 import org.gradle.api.DefaultTask
 import org.gradle.api.logging.Logger
-import org.gradle.api.tasks.TaskAction
-import org.gradle.api.tasks.TaskProvider
+import org.gradle.api.tasks.*
 import java.io.File
 import java.io.FileReader
 import java.io.FileWriter
@@ -21,12 +20,30 @@ open class CliqzConfigTask @Inject constructor(
         val buildConfigProvider: TaskProvider<GenerateBuildConfig>,
         val flavorNames: Set<String>) : DefaultTask() {
 
+    val inputFile: File by lazy { project.file(CLIQZ_CONFIG_JSON) }
+        @InputFile get
+
+    private val buildConfigTask: GenerateBuildConfig by lazy { buildConfigProvider.get() }
+    private val packageName: String by lazy { buildConfigTask.buildConfigPackageName }
+
+    val outputDirectory: File by lazy {
+        File(buildConfigTask.sourceOutputDir, packageName.replace('.', File.separatorChar))
+    }
+        @OutputDirectory get
+
+    val outputFile: File by lazy {
+        File(outputDirectory, "CliqzConfig.java")
+    }
+        @OutputFile get
+
     @TaskAction
     fun generateCliqzConfig() {
         // Read the json file
-        val configFile = project.file(CLIQZ_CONFIG_JSON)
         val type = MapTypeToken().type
-        val config = FileReader(configFile).use {
+        val config = if (!inputFile.exists()) {
+            logger.warn("Missing $CLIQZ_CONFIG_JSON")
+            Config()
+        } else FileReader(inputFile).use {
             val configs = Gson().fromJson<Map<String, Config>>(it, type)
             val defaultConfig = configs[DEFAULT_CONFIG_KEY] ?: Config()
             val mergedConfig = configs.filter { (key, _) ->
@@ -37,12 +54,8 @@ open class CliqzConfigTask @Inject constructor(
             defaultConfig.merge(mergedConfig)
             return@use defaultConfig
         }
-        val builConfigTask = buildConfigProvider.get()
-        val generatedSourceDir = builConfigTask.sourceOutputDir
-        val packageName = builConfigTask.buildConfigPackageName
-        val outDir = File(generatedSourceDir, packageName.replace('.', File.separatorChar))
-        val outFile = File(outDir, "CliqzConfig.java")
-        FileWriter(outFile).use { writer ->
+
+        FileWriter(outputFile).use { writer ->
             val javaWriter = JavaWriter(writer)
             javaWriter.emitJavadoc("Auto generated, do not edit")
                     .emitPackage(packageName)
@@ -76,6 +89,8 @@ open class CliqzConfigTask @Inject constructor(
 }
 private class MapTypeToken: TypeToken<Map<String, Config>>()
 
+// All the properties are only used via reflection, so they are "unused"
+@Suppress("unused")
 class Config {
     var amazonAccountID = ""
     var amazonAuthRoleARN = ""
@@ -84,19 +99,25 @@ class Config {
     var amazonApplicationARN = ""
     var amazonSnsTopics = mutableListOf<String>()
 
+    @Suppress("UNCHECKED_CAST")
     fun merge(other: Config, logger: Logger? = null): Config {
-        amazonAccountID = mergeProperty(logger, other, Config::amazonAccountID)
-        amazonAuthRoleARN = mergeProperty(logger, other, Config::amazonAuthRoleARN)
-        amazonUnauthRoleARN = mergeProperty(logger, other, Config::amazonUnauthRoleARN)
-        amazonIdentityPoolID = mergeProperty(logger, other, Config::amazonIdentityPoolID)
-        amazonApplicationARN = mergeProperty(logger, other, Config::amazonApplicationARN)
-        val topics = amazonSnsTopics.toMutableSet()
-        topics.addAll(other.amazonSnsTopics)
-        amazonSnsTopics = topics.toMutableList()
+        Config::class.declaredMemberProperties.forEach { member ->
+            when (member.returnType.classifier) {
+                String::class -> mergeStringProperty(logger, other, member as KMutableProperty1<Config, String>)
+                MutableList::class -> mergeListProperty(other, member as KMutableProperty1<Config, List<String>>)
+                else -> logger?.error("Can't merge property ${member.name}")
+            }
+        }
         return this
     }
 
-    private fun mergeProperty(logger: Logger?, other: Config, property: KMutableProperty1<Config, String>): String {
+    private fun mergeListProperty(other: Config, property: KMutableProperty1<Config, List<String>>) {
+        val topics = property.get(this).toMutableSet()
+        topics.addAll(property.get(other))
+        property.set(this, topics.toMutableList())
+    }
+
+    private fun mergeStringProperty(logger: Logger?, other: Config, property: KMutableProperty1<Config, String>): String {
         val v1 = property.get(this)
         val v2 = property.get(other)
         if (v1.isNotEmpty() && v2.isNotEmpty()) {

From 886dab163bb9a6490edba706b4e6cd55f1c735c5 Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Tue, 25 Jun 2019 13:34:43 +0200
Subject: [PATCH 52/57] Kotlin support, moving all the keys/tokens to
 cliqz-config.json

---
 app/build.gradle                                       | 10 ----------
 .../lumen/java/com/cliqz/browser/app/BrowserApp.java   |  9 +++++----
 .../src/main/java/com/cliqz/gradle/CliqzConfigTask.kt  |  9 +++++++--
 buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt |  3 +++
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 23df94c58..0f3e72d07 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -96,16 +96,6 @@ android {
             dimension "api"
             versionCode 8
         }
-        applicationVariants.all { variant ->
-            buildConfigField 'String', 'SENTRY_TOKEN', 'null'
-            if (variant.flavorName == "lumen" && variant.buildType.name == "release") {
-                def sentryToken = this.hasProperty("com.cliqz.lumen.sentryToken") ?
-                        this.getProperty("com.cliqz.lumen.sentryToken") : System.getenv("SENTRY_TOKEN")
-                if (sentryToken) {
-                    buildConfigField 'String', 'SENTRY_TOKEN', "\"${sentryToken}\""
-                }
-            }
-        }
 //        huawei {
 //            dimension "api"
 //            versionCode 5
diff --git a/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java b/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java
index dd09b1db8..d0639ca7e 100644
--- a/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java
+++ b/app/src/lumen/java/com/cliqz/browser/app/BrowserApp.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 
 import com.cliqz.browser.BuildConfig;
+import com.cliqz.browser.CliqzConfig;
 import com.cliqz.browser.purchases.PurchasesManager;
 import com.revenuecat.purchases.Purchases;
 
@@ -52,16 +53,16 @@ private void importVpnProfiles() {
     }
 
     private void setupCrashReporting() {
-        if (!TextUtils.isEmpty(BuildConfig.SENTRY_TOKEN)) {
-            Sentry.init(BuildConfig.SENTRY_TOKEN, new AndroidSentryClientFactory(this));
+        if (!CliqzConfig.SENTRY_TOKEN.isEmpty()) {
+            Sentry.init(CliqzConfig.SENTRY_TOKEN, new AndroidSentryClientFactory(this));
         }
     }
 
     private void setupSubscriptionSDK() {
         //noinspection ConstantConditions
-        if (!BuildConfig.REVENUECAT_API_KEY.isEmpty()) {
+        if (!CliqzConfig.REVENUECAT_API_KEY.isEmpty()) {
             Purchases.setDebugLogsEnabled(BuildConfig.DEBUG);
-            Purchases.configure(this, BuildConfig.REVENUECAT_API_KEY);
+            Purchases.configure(this, CliqzConfig.REVENUECAT_API_KEY);
             purchasesManager.checkPurchases();
         }
     }
diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
index 2831a92b3..f646bbfc4 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
@@ -98,6 +98,9 @@ class Config {
     var amazonIdentityPoolID = ""
     var amazonApplicationARN = ""
     var amazonSnsTopics = mutableListOf<String>()
+    var vpnApiKey = ""
+    var revenuecatApiKey = ""
+    var sentryToken = ""
 
     @Suppress("UNCHECKED_CAST")
     fun merge(other: Config, logger: Logger? = null): Config {
@@ -117,13 +120,15 @@ class Config {
         property.set(this, topics.toMutableList())
     }
 
-    private fun mergeStringProperty(logger: Logger?, other: Config, property: KMutableProperty1<Config, String>): String {
+    private fun mergeStringProperty(logger: Logger?, other: Config, property: KMutableProperty1<Config, String>) {
         val v1 = property.get(this)
         val v2 = property.get(other)
         if (v1.isNotEmpty() && v2.isNotEmpty()) {
             logger?.warn("Duplicated property ${property.name}")
         }
-        return if (v2.isNotEmpty()) v2 else v1
+        if (v2.isNotEmpty()) {
+            property.set(this, v2)
+        }
     }
 
 }
diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
index f6cebcf8e..5bfcedc9f 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
@@ -46,6 +46,9 @@ class CliqzPlugin: Plugin<Project> {
         taskProvider.configure {
             it.dependsOn(buildConfigProvider)
         }
+        project.tasks.named("compile${variant.name.capitalize()}Kotlin").configure {
+            it.dependsOn(taskProvider)
+        }
         javaCompileProvider.configure {
             it.dependsOn(taskProvider)
         }

From 5719532d56b2e328937ef26d08e82682d9ea3f7a Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Tue, 25 Jun 2019 19:03:16 +0200
Subject: [PATCH 53/57] cliqz-config.json is optional, warning if missing

---
 .../src/main/java/com/cliqz/gradle/CliqzConfigTask.kt  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
index f646bbfc4..b1c961289 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
@@ -7,6 +7,7 @@ import com.squareup.javawriter.JavaWriter
 import org.gradle.api.DefaultTask
 import org.gradle.api.logging.Logger
 import org.gradle.api.tasks.*
+import org.gradle.api.tasks.Optional
 import java.io.File
 import java.io.FileReader
 import java.io.FileWriter
@@ -20,8 +21,11 @@ open class CliqzConfigTask @Inject constructor(
         val buildConfigProvider: TaskProvider<GenerateBuildConfig>,
         val flavorNames: Set<String>) : DefaultTask() {
 
-    val inputFile: File by lazy { project.file(CLIQZ_CONFIG_JSON) }
-        @InputFile get
+    val inputFile: File? by lazy {
+        val inFile = project.file(CLIQZ_CONFIG_JSON)
+        if (inFile.isFile) inFile else null
+    }
+        @Optional @InputFile get
 
     private val buildConfigTask: GenerateBuildConfig by lazy { buildConfigProvider.get() }
     private val packageName: String by lazy { buildConfigTask.buildConfigPackageName }
@@ -40,7 +44,7 @@ open class CliqzConfigTask @Inject constructor(
     fun generateCliqzConfig() {
         // Read the json file
         val type = MapTypeToken().type
-        val config = if (!inputFile.exists()) {
+        val config = if (inputFile == null) {
             logger.warn("Missing $CLIQZ_CONFIG_JSON")
             Config()
         } else FileReader(inputFile).use {

From 7943efa102c9cdca52630cd8b7f1d4f67e53a92e Mon Sep 17 00:00:00 2001
From: Stefano Pacifici <stefano.pacifici@gmail.com>
Date: Mon, 8 Jul 2019 10:43:22 +0200
Subject: [PATCH 54/57] Testdroid task skeleton

---
 buildSrc/build.gradle                          |  8 ++++++++
 .../com/cliqz/gradle/TestdroidTask.groovy      | 18 ++++++++++++++++++
 .../main/java/com/cliqz/gradle/CliqzPlugin.kt  |  9 +++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 2d110ee00..4a8a15991 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm' version '1.3.31'
+    id 'groovy'
 }
 repositories {
     mavenCentral()
@@ -11,11 +12,18 @@ dependencies {
     implementation "com.android.tools.build:gradle:3.4.1"
 }
 
+// Clearing dependencies order, we do not want to compile java at all
+compileJava.dependsOn.clear()
+compileGroovy.dependsOn.clear()
+
 compileKotlin {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    dependsOn compileGroovy
+    classpath += files(compileGroovy.destinationDir)
 }
+classes.dependsOn compileGroovy
 
 compileTestKotlin {
     kotlinOptions {
diff --git a/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy b/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy
new file mode 100644
index 000000000..f9e05eee3
--- /dev/null
+++ b/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy
@@ -0,0 +1,18 @@
+package com.cliqz.gradle
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.TaskAction
+
+class TestdroidTask extends DefaultTask {
+
+    @TaskAction
+    def connectTestdroid() {
+        println("Hello, world!!!")
+        // 1. Does the project identified by the id param exists? Decide yourself how to pass this param
+        // 2. Upload the 2 apks and store the ids
+        // 3. Create the testrun and run it
+        // 4. Poll every minute (os so) to check the job finished
+        // 5. Download the artifacts and put them in a predefined folder (where Azure/Jenkins can find it)
+        // 6. log error if any test failed, otherwise just return
+    }
+}
diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
index 5bfcedc9f..5c4c7170d 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
@@ -26,10 +26,19 @@ class CliqzPlugin: Plugin<Project> {
             android.applicationVariants.forEach { variant ->
                 setVersionCode(defaultVersionCode, variant)
                 createCliqzConfigTasks(project, variant)
+                if (variant.buildType.isDebuggable) {
+                    createTestdroidTask(project, variant)
+                }
             }
         }
     }
 
+    private fun createTestdroidTask(project: Project, variant: ApplicationVariant) {
+        val taskName = "connect${variant.name.capitalize()}TestDroid"
+        // Make sure this task depends on the assembling of the app and tests, we need those file to be uploaded
+        project.tasks.register(taskName, TestdroidTask::class.java)
+    }
+
     private fun createCliqzConfigTasks(project: Project, variant: ApplicationVariant) {
         val buildConfigProvider = variant.generateBuildConfigProvider
         val javaCompileProvider = variant.javaCompileProvider

From 42ebb9fe0bbe66b639236445e4b29b7dc885140c Mon Sep 17 00:00:00 2001
From: joseph-cliqz <joseph@cliqz.com>
Date: Thu, 11 Jul 2019 15:46:57 +0200
Subject: [PATCH 55/57] Run Tests on bitbar.cloud and collect artifacts

---
 app/build.gradle                              |  10 +-
 .../browser/main/SettingsActivityTest.java    |   2 +-
 buildSrc/build.gradle                         |   1 +
 .../com/cliqz/gradle/TestdroidTask.groovy     | 144 +++++++++++++-
 .../main/java/com/cliqz/gradle/CliqzPlugin.kt |   7 +-
 testdroid/build.gradle                        |  25 ---
 testdroid/src/main/groovy/TestDroid.groovy    | 144 --------------
 .../groovy/com/cliqz/testdroid/Client.groovy  | 184 ------------------
 8 files changed, 156 insertions(+), 361 deletions(-)
 delete mode 100644 testdroid/build.gradle
 delete mode 100644 testdroid/src/main/groovy/TestDroid.groovy
 delete mode 100644 testdroid/src/main/groovy/com/cliqz/testdroid/Client.groovy

diff --git a/app/build.gradle b/app/build.gradle
index 0f3e72d07..a5d4936bf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,6 +26,7 @@ android {
         buildConfigField 'int', "VISIBLE_TOP_SITES", '4'
         
         applicationId "com.cliqz.browser"
+        testApplicationId "com.cliqz.browser.test"
         testInstrumentationRunner "com.cliqz.browser.test.CustomTestRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -37,9 +38,7 @@ android {
             shrinkResources false
             proguardFiles 'proguard-project.txt'
             versionNameSuffix '-debug'
-            dexcount {
-                enabled false
-            }
+            dexcount.enabled = false
         }
 
         release {
@@ -111,6 +110,9 @@ android {
             universalApk false
         }
     }
+    testOptions {
+        animationsDisabled = true
+    }
 }
 
 dexcount {
@@ -221,7 +223,7 @@ dependencies {
     lumenImplementation 'com.revenuecat.purchases:purchases:2.1.2'
 
     // vpn module
-    lumenImplementation 'com.cliqz:com.cliqz.vpnlib:1.0.4'
+    lumenImplementation 'com.cliqz:com.cliqz.vpnlib:1.0.1'
 
     // Testing-only dependencies
     testImplementation 'junit:junit:4.12'
diff --git a/app/src/androidTestCliqz/java/com/cliqz/browser/main/SettingsActivityTest.java b/app/src/androidTestCliqz/java/com/cliqz/browser/main/SettingsActivityTest.java
index 3433ecff7..0df6fe77b 100644
--- a/app/src/androidTestCliqz/java/com/cliqz/browser/main/SettingsActivityTest.java
+++ b/app/src/androidTestCliqz/java/com/cliqz/browser/main/SettingsActivityTest.java
@@ -103,7 +103,7 @@ public void setAndConfirmSearchEngine(final String engine, final String url) {
         onView(withText(equalToIgnoringCase("Complementary search engine"))).perform(click());
         onView(withText(equalToIgnoringCase(engine))).perform(click());
         onView(withText(equalToIgnoringCase("OK"))).perform(click());
-        onView(withText(equalToIgnoringCase("General"))).perform(pressBack());
+        onView(withText(equalToIgnoringCase("Search results for"))).perform(pressBack());
         onView(withText(equalToIgnoringCase("Settings"))).perform(pressBack());
         onView(withId(R.id.title_bar)).perform(click());
         onView(withId(R.id.search_edit_text)).perform(typeText(query),
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 4a8a15991..5d7e717e8 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -10,6 +10,7 @@ repositories {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     implementation "com.android.tools.build:gradle:3.4.1"
+    implementation "com.squareup.okhttp3:okhttp:4.0.1"
 }
 
 // Clearing dependencies order, we do not want to compile java at all
diff --git a/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy b/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy
index f9e05eee3..ad0bb1d33 100644
--- a/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy
+++ b/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy
@@ -1,18 +1,158 @@
 package com.cliqz.gradle
 
+import okhttp3.MediaType
+import okhttp3.MultipartBody
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.TaskAction
+import groovy.json.JsonSlurper
 
-class TestdroidTask extends DefaultTask {
+import java.nio.charset.StandardCharsets
+
+class TestDroidTask extends DefaultTask {
+
+    def env = System.getenv()
+    String projectId = env['PROJECT_ID']
+    String apIKey = env['API_KEY']
+    String frameworkId = env['FRAMEWORK_ID']
+    String deviceGroupId = env['DEVICE_GROUP_ID']
+
+
+    final PROJECT_ID = projectId
+    final API_KEY = apIKey
+    final FRAMEWORK_ID = frameworkId
+    final DEVICE_GROUP_ID = deviceGroupId
+
+    final OkHttpClient client = new OkHttpClient()
+    final slurper = new JsonSlurper()
 
     @TaskAction
     def connectTestdroid() {
-        println("Hello, world!!!")
         // 1. Does the project identified by the id param exists? Decide yourself how to pass this param
+        final url = new URL("https://cloud.bitbar.com/api/me/projects/${PROJECT_ID}")
+        final request = url.openConnection()
+        request.setRequestProperty('Authorization', "Basic ${getBasicAuth(API_KEY)}")
+        if (request.responseCode == HttpURLConnection.HTTP_OK) {
+            logger.info("Project exists")
+        } else {
+            logger.error("No project for the given id: ${PROJECT_ID}")
+            throw new Exception('Error occurred: Specify a project ID that exists')
+        }
         // 2. Upload the 2 apks and store the ids
+        final apkID = uploadFile("/Users/kiizajosephbazaare/browser-android/app/build/outputs/apk/cliqz/debug/app-cliqz-arm64-v8a-debug.apk")
+        final testsID = uploadFile("/Users/kiizajosephbazaare/browser-android/app/build/outputs/apk/androidTest/cliqz/debug/app-cliqz-debug-androidTest.apk")
         // 3. Create the testrun and run it
+        final runID = performTestRun(apkID, testsID)
         // 4. Poll every minute (os so) to check the job finished
+        String state = pollTestRunStatus(runID)
+        int timeTaken = 0
+        while (state!= "FINISHED"){
+            sleep(60000)
+            timeTaken+=1
+            state = pollTestRunStatus(runID)
+        }
+        logger.info("Tests finished in ${timeTaken} minutes")
         // 5. Download the artifacts and put them in a predefined folder (where Azure/Jenkins can find it)
+        fetchTestRunArtifacts(runID)
         // 6. log error if any test failed, otherwise just return
     }
+
+    def getBasicAuth(String apiKey) {
+        "${apiKey}:".bytes.encodeBase64().toString()
+    }
+
+    def uploadFile(String filepath){
+        final file = new File(filepath)
+        final mediaType = MediaType.parse('application/octet-stream')
+        def requestBody = new MultipartBody.Builder()
+            .setType(MultipartBody.FORM)
+            .addFormDataPart('file', file.name, RequestBody.create(file, mediaType))
+            .build()
+        def request = new Request.Builder()
+            .header('Authorization', "Basic ${getBasicAuth(API_KEY)}")
+            .url("https://cloud.bitbar.com/api/me/files")
+            .post(requestBody)
+            .build()
+        final response = client.newCall(request).execute()
+        if (!response.isSuccessful()) throw new IOException("Unexpected file" + response.code)
+        final json = slurper.parseText(response.body.string())
+        json.id
+    }
+
+    def performTestRun(long appFileID, long testFileID){
+        final mediaType = MediaType.parse('application/json')
+        final content = """
+            {
+                "osType":"ANDROID",
+                "projectId":"$PROJECT_ID",
+                "files":[
+                    {"id":"$appFileID"},
+                    {"id":"$testFileID"}
+                ],
+                "frameworkId":"$FRAMEWORK_ID",
+                "deviceGroupId":"$DEVICE_GROUP_ID"
+            }""".stripIndent()
+
+        def request = new Request.Builder()
+            .header('Authorization', "Basic ${getBasicAuth(API_KEY)}")
+            .url("https://cloud.bitbar.com/api/me/runs")
+            .post(RequestBody.create(content, mediaType))
+            .build()
+        final response = client.newCall(request).execute()
+        if (!response.isSuccessful()) throw new IOException("Test run not possible " + response.code)
+        final testRun = slurper.parseText(response.body.string())
+        response.close()
+        testRun.id
+    }
+
+    def pollTestRunStatus(long testID){
+        final poll = new URL("https://cloud.bitbar.com/api/me/projects/${PROJECT_ID}/runs/${testID}")
+        final check = poll.openConnection()
+        check.setRequestProperty('Authorization', "Basic ${getBasicAuth(API_KEY)}")
+        if (check.responseCode == HttpURLConnection.HTTP_OK){
+            final pollStatus = slurper.parseText (check.content.text)
+            pollStatus.state
+        } else {
+            logger.error("No Test Run for the given id: ${testID}")
+        }
+    }
+
+    def fetchTestRunArtifacts(long testRunID){
+        final url = new URL("https://cloud.bitbar.com/api/me/projects/${PROJECT_ID}/runs/${testRunID}/device-sessions")
+        final sessions = url.openConnection()
+        sessions.setRequestProperty('Authorization', "Basic ${getBasicAuth(API_KEY)}")
+        if (sessions.responseCode == HttpURLConnection.HTTP_OK){
+            final sessionResults = slurper.parse(sessions.inputStream)
+            sessionResults.data.each{ session ->
+                println "Device: ${session.device.displayName} ID: ${session.id} SuccessRatio: ${session.successRatio}"
+                if (session.successRatio < 1){
+                    def request = new Request.Builder()
+                    .url("https://cloud.bitbar.com/api/me/projects/${PROJECT_ID}/runs/${testRunID}/device-sessions/${session.id}/output-file-set/files.zip")
+                    .header('Authorization', "Basic ${getBasicAuth(API_KEY)}")
+                    .get()
+                    .build()
+                    final artifact = client.newCall(request).execute()
+                    def something
+                    FileOutputStream artifactFile = new FileOutputStream("./artifacts/${session.id}.zip")
+                    byte[] buf = new byte[1024]
+                    while ( (something = artifact.body().source().read(buf)) != -1){
+                        artifactFile.write(buf, 0, something)
+                    }
+                    artifactFile.flush()
+                    if (artifact.isSuccessful()){
+                        logger.info("Artifacts downloaded")
+                        println("Artifacts downloaded")
+                    }else{
+                        logger.error("Files for Session ${session.id} are not available")
+                    }
+                }else {
+                    logger.info("Tests runs on ${session.device.displayName} were successful ")
+                }
+            }
+        } else{
+            logger.error("No session data for test run ${testRunID}")
+        }
+    }
 }
diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
index 5c4c7170d..147aeaeeb 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzPlugin.kt
@@ -36,7 +36,12 @@ class CliqzPlugin: Plugin<Project> {
     private fun createTestdroidTask(project: Project, variant: ApplicationVariant) {
         val taskName = "connect${variant.name.capitalize()}TestDroid"
         // Make sure this task depends on the assembling of the app and tests, we need those file to be uploaded
-        project.tasks.register(taskName, TestdroidTask::class.java)
+        val assembleTestProvider = project.tasks.named("assemble${variant.name.capitalize()}AndroidTest")
+        val assembleProvider = project.tasks.named("assemble${variant.name.capitalize()}")
+        val taskProvider = project.tasks.register(taskName, TestDroidTask::class.java)
+        taskProvider.configure {
+            it.dependsOn(assembleProvider, assembleTestProvider)
+        }
     }
 
     private fun createCliqzConfigTasks(project: Project, variant: ApplicationVariant) {
diff --git a/testdroid/build.gradle b/testdroid/build.gradle
deleted file mode 100644
index 64ec8e9a9..000000000
--- a/testdroid/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-apply plugin: 'groovy'
-
-targetCompatibility = '1.7'
-sourceCompatibility = '1.7'
-
-//create a single Jar with all dependencies
-task('testdroid-cli', type: Jar) {
-    manifest {
-        attributes 'Implementation-Title': 'Gradle Jar File Example',
-                'Implementation-Version': '1.0',
-                'Main-Class': 'TestDroid'
-    }
-    baseName = project.name + '-cli'
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-    with jar
-}
-
-dependencies {
-    compile 'com.testdroid:testdroid-api:2.39'
-    compile 'org.codehaus.groovy:groovy-all:2.4.7'
-    compile 'commons-cli:commons-cli:1.2'
-    compile("jline:jline:2.11") {
-        exclude(group: 'junit', module: 'junit')
-    }
-}
diff --git a/testdroid/src/main/groovy/TestDroid.groovy b/testdroid/src/main/groovy/TestDroid.groovy
deleted file mode 100644
index f490be7ce..000000000
--- a/testdroid/src/main/groovy/TestDroid.groovy
+++ /dev/null
@@ -1,144 +0,0 @@
-import com.cliqz.testdroid.Client
-
-import static com.cliqz.testdroid.Client.client
-
-/**
- * @author Stefano Pacifici
- */
-class TestDroid {
-    def cli = new CliBuilder(usage: 'testdroid [options]', header: 'Options:')
-
-    void errorMessage(msg) {
-        println msg
-        cli.usage()
-        System.exit(1)
-    }
-
-    static void main(String... args) {
-        def testdroid = new TestDroid()
-        System.exit(testdroid.run(args))
-    }
-
-    static def parseTestType(str) {
-        switch (str) {
-            case 'xc':
-                return Client.xc
-            default:
-                return Client.android
-        }
-
-    }
-
-    // Return a value that you can use as Unix error code (0 success, any other value failure)
-    def run(String... args) {
-        cli._(longOpt: 'env', 'All parameters are passed trough the environment')
-        cli.u(longOpt: 'user', args: 1, argName: 'user name', 'Testdroid username')
-        cli._(longOpt: 'help', 'Print this help message')
-        cli._(longOpt: 'app', args: 1, argName: 'app path', 'The path of the apk_ipa to test')
-        cli._(longOpt: 'tests', args: 1, argName: 'tests path', 'Tha path of the automation tests apk_zip')
-        cli.p(longOpt: 'project', args: 1, argName: 'project name', 'Testdroid project name')
-        cli.r(longOpt: 'run', args: 1, argName: 'run name', 'Testdroid run name')
-        cli.d(longOpt: 'dev', args: 1, argName: 'device group', 'Testdroid devices group to use')
-        cli._(longOpt: 'dst', args: 1, argName: 'dest folder', 'Test artifacts destination folder')
-        cli.t(longOpt: 'type', args: 1, argName: 'test type', 'The test type (default: android, values: android, xc)')
-
-        def options = cli.parse(args)
-
-        def user
-        def pass = null
-        def devGroup
-        def projectName
-        def testRunName
-        def appPackage
-        def testsPackage
-        def dstFolder
-        def type
-
-        if (options.help) {
-            cli.usage()
-            return
-        }
-
-        if (options.env) {
-            def env = System.getenv()
-            user = env['TESTDROID_USER']
-            pass = env['TESTDROID_PASS']
-            devGroup = env['TESTDROID_DEVICE_GROUP']
-            projectName = env['TESTDROID_PROJECT_NAME']
-            testRunName = env['TESTDROID_RUN_NAME']
-            appPackage = env['APK_IPA']
-            testsPackage = env['TEST_APK_ZIP']
-            dstFolder = env['ARTIFACTS_FOLDER']
-            type = parseTestType(env['TESTDROID_TEST_TYPE'])
-        } else {
-            user = options.u
-            devGroup = options.d
-            projectName = options.p
-            testRunName = options.r
-            appPackage = options.app
-            testsPackage = options.tests
-            dstFolder = options.dst
-            type = parseTestType(options.t)
-        }
-
-        // Check parameters
-        if (!user) {
-            errorMessage 'User name is mandatory'
-        }
-        if (!projectName) {
-            errorMessage 'Project name is required'
-        }
-        if (!devGroup) {
-            devGroup = 14
-        }
-        if (!checkFile(appPackage)) {
-            errorMessage "App file not found ${appPackage}"
-        }
-        if (!checkFile(testsPackage)) {
-            errorMessage "Tests file not found ${testsPackage}"
-        }
-        if (!testRunName) {
-            testRunName = "Run on ${new Date().format("yyyy/MM/dd HH:mm")}"
-        }
-        if (!options.env) {
-            // Try to read the password from the shell
-            print "Password: "
-            def passwordChars = System.console().readPassword()
-            pass = new String(passwordChars)
-        } else if (!pass) {
-            errorMessage 'Password not present in the environment'
-        }
-
-        client {
-            username user
-            password pass
-            // apiKey API_KEY // apiKey(API_KEY)
-            project projectName
-            testRun testRunName
-            deviceGroup devGroup
-            testType type
-            appFile appPackage
-            testFile testsPackage
-            artifactsFolder file(dstFolder)
-        }
-    }
-
-    static boolean checkFile(path) {
-        try {
-            new File(path).isFile()
-        } catch (ignored) {
-            false
-        }
-    }
-
-    static boolean checkFolder(path) {
-        try {
-            new File(path).isDirectory()
-        } catch (ignored) {
-            false
-        }
-    }
-
-    static File file(path) { new File(path) }
-}
-
diff --git a/testdroid/src/main/groovy/com/cliqz/testdroid/Client.groovy b/testdroid/src/main/groovy/com/cliqz/testdroid/Client.groovy
deleted file mode 100644
index a6a8a05c8..000000000
--- a/testdroid/src/main/groovy/com/cliqz/testdroid/Client.groovy
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.cliqz.testdroid
-
-import com.testdroid.api.APIFilter.APIFilterItem
-import com.testdroid.api.APIList
-import com.testdroid.api.APIQueryBuilder
-import com.testdroid.api.DefaultAPIClient
-import com.testdroid.api.model.APIDeviceSession
-import com.testdroid.api.model.APIProject
-import com.testdroid.api.model.APITestRun
-import com.testdroid.api.model.APIUser
-
-class Client {
-
-    final static SUCCESS_ERROR_CODE = 0
-    final static NO_TEST_ERROR_CODE = 1
-    final static TOO_MANY_TEST_FAILURES_ERROR_CODE = 2
-
-    final static float SUCCESS_RATIO_THRESHOLD = 0.95
-
-    final ANDROID_FILE_MIME_TYPE = "application/vnd.android.package-archive"
-    final API_URL = 'https://cloud.testdroid.com'
-    private final params = [:]
-
-    static def android = APIProject.Type.ANDROID
-    static def xc = APIProject.Type.XCTEST
-
-    Client() {
-        params['deviceGroup'] = 14
-        params['testType'] = android
-    }
-
-    def methodMissing(String name, args) {
-        params.put(name, args[0])
-    }
-
-    def propertyMissing(String name) {
-        final value = params[name]
-        if (!value) {
-            throw new MissingPropertyException(name, this.class)
-        }
-        value
-    }
-
-    static def log(msg, closure) {
-        print "${msg}... "
-        def result = closure()
-        println 'DONE'
-        result
-    }
-
-    @SuppressWarnings("GrReassignedInClosureLocalVar")
-    def getProject(me) {
-        APIProject project
-        log("Check project if project ${params.project} exists") {
-            APIQueryBuilder builder = new APIQueryBuilder();
-            APIFilterItem item = new APIFilterItem(APIFilterItem.Type.S,
-                    'name', APIFilterItem.Operand.EQ, params.project)
-            builder.filter([item])
-            project = me.getProjectsResource(builder).entity.find { APIProject pr ->
-                pr.name == params.project
-            }
-        }
-        if (project == null) {
-            project = log("Creating project ${params.project}") {
-                me.createProject(params.testType, params.project)
-            }
-        }
-        project
-    }
-
-    // Project id: 109335866
-    // Test run: 109336945
-    def execute() {
-        final client = new DefaultAPIClient(API_URL, params['username'], params['password'])
-        final APIUser me = log('Logging in') { client.me() }
-        // A project is typically a branch
-        final APIProject project = getProject(me)
-        log('Updating configuration') {
-            final config = project.testRunConfig
-            config.instrumentationRunner = 'com.cliqz.browser.test.CustomTestRunner'
-            config.timeout = 600000
-            if (params.deviceGroup) {
-                try {
-                    config.usedDeviceGroupId = params.deviceGroup as Long
-                    config.usedDeviceGroupName = ""
-                } catch (ignored) {
-                    config.usedDeviceGroupName = params.deviceGroup
-                    config.usedDeviceGroupId = 0
-                }
-            }
-            config.update()
-        }
-        def mimetype
-        if (params.testType == android) {
-            mimetype = ANDROID_FILE_MIME_TYPE
-        } else {
-            mimetype = 'application/octet-stream'
-        }
-
-        log('Uploading APK_IPA') {
-            project.uploadApplication(new File(params.appFile), mimetype)
-        }
-        log('Uploading test APK_ZIP') {
-            project.uploadTest(new File(params.testFile), mimetype)
-        }
-        print 'Running tests'
-        final testRun = params.testRun ?
-                project.run(params.testRun) : project.run()
-
-        // Wait for test completion
-        def abortTime = System.currentTimeMillis() + 1800000L;
-        while (testRun.state != APITestRun.State.FINISHED) {
-            sleep(10000)
-            print '.'
-            testRun.update()
-            def now = System.currentTimeMillis();
-            if (testRun.runningDeviceCount == 0 && abortTime - now < 0) {
-                testRun.abort()
-                break;
-            }
-            if (testRun.runningDeviceCount > 0) {
-                abortTime = System.currentTimeMillis() + 600000L;
-            }
-        }
-        println ' DONE'
-        if (testRun.finishedDeviceCount == 0) {
-            return NO_TEST_ERROR_CODE
-        }
-        testRun.deviceSessions.iterator().findAll({ session ->
-            session.state == APIDeviceSession.State.SUCCEEDED
-        }).each { session ->
-            final deviceName = session.device.displayName
-            final dst = new File(params.artifactsFolder, "${deviceName}.zip")
-            dst.delete()
-            dst.append(session.outputFiles)
-        }
-        if (testRun.successRatio < SUCCESS_RATIO_THRESHOLD) {
-            TOO_MANY_TEST_FAILURES_ERROR_CODE
-        } else {
-            SUCCESS_ERROR_CODE
-        }
-    }
-
-    /**
-     * Execute the tests on testdroid platform using the given configuration
-     *
-     * @param closure the configuration closure
-     * @return 0 if success, some value > 0 in case of error
-     */
-    static client(closure) {
-        final cl = new Client()
-        closure.delegate = cl;
-        closure()
-        cl.execute()
-    }
-
-    static {
-        APIUser.metaClass.getProjects = { -> projectsResource.entity }
-
-        APIProject.metaClass.getTestRuns = { -> testRunsResource.entity }
-
-        APITestRun.metaClass.getFiles = { -> filesResource.entity }
-        APITestRun.metaClass.getDeviceSessions { -> deviceSessionsResource.entity }
-
-        APIList.metaClass.iterator = {
-            def list = delegate as APIList
-            def iter = list.data.iterator()
-            [
-                    hasNext: { ->
-                        if (iter.hasNext()) {
-                            true
-                        } else if (list.nextAvailable) {
-                            list = list.nextItems
-                            iter = list.data.iterator()
-                            iter.hasNext()
-                        } else {
-                            false
-                        }
-                    },
-                    next: { -> iter.next() }
-            ] as Iterator
-        }
-    }
-}

From e06c4bab258d8d7d4a41e9c7e42e6e886c92dcf9 Mon Sep 17 00:00:00 2001
From: joseph-cliqz <joseph@cliqz.com>
Date: Tue, 16 Jul 2019 13:59:05 +0200
Subject: [PATCH 56/57] Implement flow on test faliure

---
 app/build.gradle                              |  6 ++-
 .../com/cliqz/gradle/TestdroidTask.groovy     | 44 +++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a5d4936bf..6969edab6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,7 +38,9 @@ android {
             shrinkResources false
             proguardFiles 'proguard-project.txt'
             versionNameSuffix '-debug'
-            dexcount.enabled = false
+            dexcount {
+                enabled false
+            }
         }
 
         release {
@@ -223,7 +225,7 @@ dependencies {
     lumenImplementation 'com.revenuecat.purchases:purchases:2.1.2'
 
     // vpn module
-    lumenImplementation 'com.cliqz:com.cliqz.vpnlib:1.0.1'
+    lumenImplementation 'com.cliqz:com.cliqz.vpnlib:1.0.4'
 
     // Testing-only dependencies
     testImplementation 'junit:junit:4.12'
diff --git a/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy b/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy
index ad0bb1d33..b23545b57 100644
--- a/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy
+++ b/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy
@@ -57,6 +57,20 @@ class TestDroidTask extends DefaultTask {
         // 5. Download the artifacts and put them in a predefined folder (where Azure/Jenkins can find it)
         fetchTestRunArtifacts(runID)
         // 6. log error if any test failed, otherwise just return
+        Float successRatio = errorLogger(runID)
+        if (successRatio == 1){
+            logger.info("Test Run was successful")
+            println("Test Run was successful")
+        }else if (successRatio < 1  && successRatio > 0.90){
+            logger.info("Need to get session success Ratios")
+            Float sessionSuccessRatio = sessionErrorLogger(runID)
+            if (sessionSuccessRatio < 0.50){
+                logger.error("Need to check tests that are failing")
+                throw new Exception('Tests are failing')
+            }else {
+               logger.info("Test run was not 100% successful but that's okay")
+            }
+        }
     }
 
     def getBasicAuth(String apiKey) {
@@ -155,4 +169,34 @@ class TestDroidTask extends DefaultTask {
             logger.error("No session data for test run ${testRunID}")
         }
     }
+    def errorLogger(long testRunID){
+        final url = new URL("https://cloud.bitbar.com/api/me/projects/${PROJECT_ID}/runs/${testRunID}")
+        final testRun = url.openConnection()
+        testRun.setRequestProperty('Authorization', "Basic ${getBasicAuth(API_KEY)}")
+        if (testRun.responseCode == HttpURLConnection.HTTP_OK) {
+            final testRunResult = slurper.parse(testRun.inputStream)
+            testRunResult.successRatio
+        }
+        else {
+            logger.error("No Test Run for the given id: ${testRunID}")
+        }
+    }
+    def sessionErrorLogger(long testRunID){
+        final url = new URL("https://cloud.bitbar.com/api/me/projects/${PROJECT_ID}/runs/${testRunID}/device-sessions")
+        final sessions = url.openConnection()
+        sessions.setRequestProperty('Authorization', "Basic ${getBasicAuth(API_KEY)}")
+        if (sessions.responseCode == HttpURLConnection.HTTP_OK) {
+            final sessionResults = slurper.parse(sessions.inputStream)
+            sessionResults.data.each { session ->
+                println "Device: ${session.device.displayName} ID: ${session.id} SuccessRatio: ${session.successRatio}"
+                if (session.successRatio < 0.5){
+                    logger.error("Tests are failing on ${session.displayName}")
+                    session.successRatio
+                }else{
+                    logger.info("Tests are failing but that's okay")
+                    session.successRatio
+                }
+            }
+        }
+    }
 }

From 91db4e7ac81198057a1a91041ff3f78d1fc2c47f Mon Sep 17 00:00:00 2001
From: joseph-cliqz <joseph@cliqz.com>
Date: Wed, 17 Jul 2019 11:29:03 +0200
Subject: [PATCH 57/57] Changes after Review

---
 .../com/cliqz/gradle/TestdroidTask.groovy     | 43 +++++++++++--------
 .../java/com/cliqz/gradle/CliqzConfigTask.kt  |  1 +
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy b/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy
index b23545b57..f5504c7de 100644
--- a/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy
+++ b/buildSrc/src/main/groovy/com/cliqz/gradle/TestdroidTask.groovy
@@ -5,6 +5,7 @@ import okhttp3.MultipartBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
+import org.apache.commons.io.FileUtils
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.TaskAction
 import groovy.json.JsonSlurper
@@ -58,13 +59,13 @@ class TestDroidTask extends DefaultTask {
         fetchTestRunArtifacts(runID)
         // 6. log error if any test failed, otherwise just return
         Float successRatio = errorLogger(runID)
-        if (successRatio == 1){
+        if (successRatio >= 0.9999){
             logger.info("Test Run was successful")
             println("Test Run was successful")
         }else if (successRatio < 1  && successRatio > 0.90){
             logger.info("Need to get session success Ratios")
             Float sessionSuccessRatio = sessionErrorLogger(runID)
-            if (sessionSuccessRatio < 0.50){
+            if (sessionSuccessRatio < 0.50 && sessionSuccessRatio > 0.000){
                 logger.error("Need to check tests that are failing")
                 throw new Exception('Tests are failing')
             }else {
@@ -137,28 +138,27 @@ class TestDroidTask extends DefaultTask {
         final url = new URL("https://cloud.bitbar.com/api/me/projects/${PROJECT_ID}/runs/${testRunID}/device-sessions")
         final sessions = url.openConnection()
         sessions.setRequestProperty('Authorization', "Basic ${getBasicAuth(API_KEY)}")
+        new File("./artifacts").eachFile {file ->
+            if (file.name.contains(".zip")) file.delete()
+        }
         if (sessions.responseCode == HttpURLConnection.HTTP_OK){
             final sessionResults = slurper.parse(sessions.inputStream)
             sessionResults.data.each{ session ->
                 println "Device: ${session.device.displayName} ID: ${session.id} SuccessRatio: ${session.successRatio}"
                 if (session.successRatio < 1){
-                    def request = new Request.Builder()
-                    .url("https://cloud.bitbar.com/api/me/projects/${PROJECT_ID}/runs/${testRunID}/device-sessions/${session.id}/output-file-set/files.zip")
-                    .header('Authorization', "Basic ${getBasicAuth(API_KEY)}")
-                    .get()
-                    .build()
-                    final artifact = client.newCall(request).execute()
-                    def something
-                    FileOutputStream artifactFile = new FileOutputStream("./artifacts/${session.id}.zip")
-                    byte[] buf = new byte[1024]
-                    while ( (something = artifact.body().source().read(buf)) != -1){
-                        artifactFile.write(buf, 0, something)
+                    def request = new URL("https://cloud.bitbar.com/api/me/projects/${PROJECT_ID}/runs/${testRunID}/device-sessions/${session.id}/output-file-set/files.zip")
+                    final artifact = request.openConnection()
+                    artifact.setRequestProperty('Authorization', "Basic ${getBasicAuth(API_KEY)}")
+                    println "Getting Artifacts for Device: ${session.device.displayName}"
+                    new File("./artifacts/${session.id}.zip").withOutputStream { out ->
+                        artifact.inputStream.with { inp ->
+                            out << inp
+                        }
                     }
-                    artifactFile.flush()
-                    if (artifact.isSuccessful()){
+                    if (artifact.responseCode == HttpURLConnection.HTTP_OK) {
                         logger.info("Artifacts downloaded")
                         println("Artifacts downloaded")
-                    }else{
+                    } else {
                         logger.error("Files for Session ${session.id} are not available")
                     }
                 }else {
@@ -169,6 +169,7 @@ class TestDroidTask extends DefaultTask {
             logger.error("No session data for test run ${testRunID}")
         }
     }
+
     def errorLogger(long testRunID){
         final url = new URL("https://cloud.bitbar.com/api/me/projects/${PROJECT_ID}/runs/${testRunID}")
         final testRun = url.openConnection()
@@ -181,6 +182,7 @@ class TestDroidTask extends DefaultTask {
             logger.error("No Test Run for the given id: ${testRunID}")
         }
     }
+
     def sessionErrorLogger(long testRunID){
         final url = new URL("https://cloud.bitbar.com/api/me/projects/${PROJECT_ID}/runs/${testRunID}/device-sessions")
         final sessions = url.openConnection()
@@ -189,14 +191,19 @@ class TestDroidTask extends DefaultTask {
             final sessionResults = slurper.parse(sessions.inputStream)
             sessionResults.data.each { session ->
                 println "Device: ${session.device.displayName} ID: ${session.id} SuccessRatio: ${session.successRatio}"
-                if (session.successRatio < 0.5){
+                if (session.successRatio < 0.5 && session.successRatio != null){
                     logger.error("Tests are failing on ${session.displayName}")
                     session.successRatio
-                }else{
+                }else if(session.successRatio == null){
+                    logger.error("Tests did not run on this device")
+                    session.successRatio = 0
+                    session.successRatio
+                }else {
                     logger.info("Tests are failing but that's okay")
                     session.successRatio
                 }
             }
+            sessionResults.successRatio
         }
     }
 }
diff --git a/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
index b1c961289..5659d778a 100644
--- a/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
+++ b/buildSrc/src/main/java/com/cliqz/gradle/CliqzConfigTask.kt
@@ -105,6 +105,7 @@ class Config {
     var vpnApiKey = ""
     var revenuecatApiKey = ""
     var sentryToken = ""
+    var credentialUrl = ""
 
     @Suppress("UNCHECKED_CAST")
     fun merge(other: Config, logger: Logger? = null): Config {