fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

update commons, kotlin, gradle

Browse Source
This commit is contained in:
tibbi
2017-11-29 21:51:05 +01:00
parent c1c96af585
commit 0b01a79942
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -46,7 +46,7 @@ ext {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:2.41.5' implementation 'com.simplemobiletools:commons:3.0.0'
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion" debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion" releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion"

3
app/src/main/AndroidManifest.xml
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.simplemobiletools.camera"> package="com.simplemobiletools.camera"
android:installLocation="auto">
<uses-feature <uses-feature
android:name="android.hardware.camera" android:name="android.hardware.camera"

2
app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt
View File

@ -256,8 +256,8 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
try { try {
mParameters!!.zoom = newZoomFactor mParameters!!.zoom = newZoomFactor
} catch (ignored: Exception) { } catch (ignored: Exception) {
mCamera?.parameters = mParameters
} }
mCamera?.parameters = mParameters
return true return true
} }

2
app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
View File

@ -53,6 +53,7 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setTheme(R.style.FullScreenTheme)
requestWindowFeature(Window.FEATURE_NO_TITLE) requestWindowFeature(Window.FEATURE_NO_TITLE)
window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN) window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
if (config.alwaysOpenBackCamera) if (config.alwaysOpenBackCamera)
@ -68,6 +69,7 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
setTheme(R.style.FullScreenTheme)
if (hasStorageAndCameraPermissions()) { if (hasStorageAndCameraPermissions()) {
resumeCameraItems() resumeCameraItems()
setupPreviewImage(mIsInPhotoMode) setupPreviewImage(mIsInPhotoMode)

8
app/src/main/kotlin/com/simplemobiletools/camera/activities/SplashActivity.kt
View File

@ -1,12 +1,10 @@
package com.simplemobiletools.camera.activities package com.simplemobiletools.camera.activities
import android.content.Intent import android.content.Intent
import android.os.Bundle import com.simplemobiletools.commons.activities.BaseSplashActivity
import com.simplemobiletools.commons.activities.BaseSimpleActivity
open class SplashActivity : BaseSimpleActivity() { class SplashActivity : BaseSplashActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun initActivity() {
super.onCreate(savedInstanceState)
startActivity(Intent(this, MainActivity::class.java)) startActivity(Intent(this, MainActivity::class.java))
finish() finish()
} }

2
build.gradle
View File

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.1.60' ext.kotlin_version = '1.2.0'
repositories { repositories {
jcenter() jcenter()