Merge branch 'release/5.50.0'

Author: subsymbolic

app/version/version.properties

@@ -1 +1 @@
-VERSION=5.50.0  
+VERSION=5.50.0

styleguide/IDE_kotlin_style.png

@@ -1,26 +1,23 @@
-## General
+## DuckDuckGo Android Style Guide
 * We care about clean code and aim to make this codebase as self-documenting and readable as possible.
-* We primarily use Kotlin and follow the standard coding conventions outlined in https://kotlinlang.org/docs/reference/coding-conventions.html
+* We primarily use Kotlin and follow coding conventions based on the [Android Kotlin Style Guide](https://developer.android.com/kotlin/style-guide)
 * There may be instances of code that pre-dates our use of this style guide, these can be refactored as we encounter them.
 
-**IDE Setup:**
-* Open Android Studio preferences
-* Tap on code style, select Kotlin
-* Select Set From, Predefined Style, Kotlin Style Guide
-![Setting kotlin style screenshot](IDE_kotlin_style.png)
+###  Android Studio Setup
 
-## Line breaks
-* We use a line margin of 150 rather than the default of 100 as the default causes excessive line breaks. The larger margin allows us to take advantage of modern widescreen monitors with more screen real-estate.
+We've provided a coding style that can be imported into Android Studio.
+The file can be found [here](ddg-settings.zip).
 
-**IDE Setup:**
-* Open android studio preferences
-* Tap on code style
-* Enter 150 into "Page margin"
+* From Android Studio click on File -> Import Settings
 
-![Setting kotlin style screenshot](IDE_line_wrap.png)
+![Setting kotlin style screenshot](import_settings_one.png)
 
+* Select the file you just downloaded
+* Import all components required (AndroidEditors and Code Style)
 
-## Timber
+##  Code conventions
+
+### Logging
 When logging with Timber we use the new Kotlin styles strings
 
 ```Timber.w("Loading $url")```
@@ -31,7 +28,7 @@ Rather than C style strings
 
 Mixing the two styles within a single statement can lead to crashes so we have standardized on the more readable Kotlin style. This is slightly less efficient - should efficiency become an issue we can use proguard to optimize away log statements for releases.
 
-## Package Names
+### Package Names
 Case in package names is problematic as some file system and tools do not handle case sensitive file changes well. For this reason, we opt for lowercase packages in our project. Thus we have:
 
 ```package com.duckduckgo.app.trackerdetection```
@@ -40,7 +37,7 @@ rather than:
 
 ```package com.duckduckgo.app.trackerDetection```
 
-## Unit test names
+### Unit test names
 We use the when then convention for test:
 
 ```when <condition> then <expected result>```