forked from hardcoresushi/DroidFS
Updating to NDK r21d
This commit is contained in:
parent
a916f27367
commit
d19007f099
@ -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"
|
||||
|
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user