From d19007f099e16b87f00d2bf0df6ba4a5d0265581 Mon Sep 17 00:00:00 2001
From: Hardcore Sushi <hardcore.sushi@disroot.org>
Date: Fri, 23 Oct 2020 16:42:40 +0200
Subject: [PATCH] Updating to NDK r21d

---
 app/build.gradle                                           | 4 ++--
 app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ed967da..1f2a19e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,6 +5,7 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion 29
     buildToolsVersion "30.0.2"
+    ndkVersion '21.3.6528147'
 
     compileOptions {
         targetCompatibility JavaVersion.VERSION_1_8
@@ -17,7 +18,6 @@ android {
         versionCode 5
         versionName "1.1.10"
 
-        android.ndkVersion = "21.2.6472646"
         ndk {
             abiFilters 'x86_64', 'armeabi-v7a', 'arm64-v8a'
         }
@@ -47,7 +47,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "androidx.core:core-ktx:1.3.2"
     implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "androidx.constraintlayout:constraintlayout:2.0.2"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.3"
 
     implementation "androidx.sqlite:sqlite-ktx:2.1.0"
     implementation "androidx.preference:preference-ktx:1.1.1"
diff --git a/app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt b/app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt
index c0a0447..884e4f0 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt
@@ -170,7 +170,7 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
     fun onClickGrid(view: View) {
         ColoredAlertDialogBuilder(this)
             .setTitle(getString(R.string.choose_grid))
-            .setSingleChoiceItems(gridTitles.map { getString(it) as CharSequence }.toTypedArray(), gridValues.indexOf(camera.grid)){ dialog, which ->
+            .setSingleChoiceItems(gridTitles.map { getString(it) }.toTypedArray(), gridValues.indexOf(camera.grid)){ dialog, which ->
                 camera.grid = gridValues[which]
                 image_grid.setImageResource(if (camera.grid == Grid.OFF){ R.drawable.icon_grid_off } else { R.drawable.icon_grid_on })
                 dialog.dismiss()