-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support for Sony Alpha 7 III (ILCE-7M3)
- added automatic detection of camera and API urls - add device name to connection screen - added dependency injection with Dagger - refactored connection state machine - refactored SimpleStreamSurfaceView - refactored AdjustmentsFragment - removed Volley - added Glide for image loading - converted project to Kotlin - migrate to AndroidX fixes #1
- Loading branch information
Showing
96 changed files
with
5,609 additions
and
5,497 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,42 +1,74 @@ | ||
# built application files | ||
### Android template | ||
# Built application files | ||
*.apk | ||
*.ap_ | ||
app/release | ||
|
||
# files for the dex VM | ||
# Files for the ART/Dalvik VM | ||
*.dex | ||
|
||
# Java class files | ||
*.class | ||
|
||
# generated files | ||
# Generated files | ||
bin/ | ||
gen/ | ||
out/ | ||
|
||
# Gradle files | ||
.gradle/ | ||
build/ | ||
|
||
# Local configuration file (sdk path, etc) | ||
local.properties | ||
|
||
# Eclipse project files | ||
#.classpath | ||
#.project | ||
|
||
# Proguard folder generated by Eclipse | ||
proguard/ | ||
|
||
# Intellij/Android Studio project files | ||
# Log Files | ||
*.log | ||
|
||
# Android Studio Navigation editor temp files | ||
.navigation/ | ||
|
||
# Android Studio captures folder | ||
captures/ | ||
|
||
# IntelliJ | ||
*.iml | ||
*.ipr | ||
*.iws | ||
.idea/ | ||
.gradle | ||
.idea/caches | ||
.idea/libraries | ||
.idea/dictionaries | ||
.idea/compiler.xml | ||
.idea/encodings.xml | ||
.idea/gradle.xml | ||
.idea/misc.xml | ||
.idea/modules.xml | ||
.idea/runConfigurations.xml | ||
.idea/vcs.xml | ||
.idea/workspace.xml | ||
|
||
# Keystore files | ||
# Uncomment the following line if you do not want to check your keystore files in. | ||
#*.jks | ||
|
||
# External native build folder generated in Android Studio 2.2 and later | ||
.externalNativeBuild | ||
|
||
# Google Services (e.g. APIs or Firebase) | ||
google-services.json | ||
|
||
# Exclude OS X folder attributes | ||
.DS_Store | ||
# Freeline | ||
freeline.py | ||
freeline/ | ||
freeline_project_description.json | ||
|
||
# Exclude Dist Keys | ||
*.key | ||
# fastlane | ||
fastlane/report.xml | ||
fastlane/Preview.html | ||
fastlane/screenshots | ||
fastlane/test_output | ||
fastlane/readme.md | ||
|
||
#NDK | ||
obj/ | ||
### Project | ||
docs/*.pdf | ||
docs/CameraRemoteAPIbeta_SDK_2.40 |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,91 @@ | ||
apply plugin: 'com.android.application' | ||
apply plugin: 'kotlin-android' | ||
apply plugin: 'kotlin-android-extensions' | ||
apply plugin: 'kotlin-kapt' | ||
|
||
android { | ||
compileSdkVersion 27 | ||
buildToolsVersion '27.0.3' | ||
compileSdkVersion projectCompileSdkVersion | ||
buildToolsVersion projectBuildToolsVersion | ||
|
||
defaultConfig { | ||
applicationId "com.thibaudperso.sonycamera" | ||
minSdkVersion 16 | ||
targetSdkVersion 27 | ||
minSdkVersion projectMinSdkVersion | ||
targetSdkVersion projectTargetSdkVersion | ||
|
||
multiDexEnabled true | ||
|
||
versionCode 40 | ||
versionName "4.0.0" | ||
|
||
vectorDrawables.useSupportLibrary = true | ||
} | ||
compileOptions { | ||
sourceCompatibility JavaVersion.VERSION_1_8 | ||
targetCompatibility JavaVersion.VERSION_1_8 | ||
} | ||
testOptions { | ||
unitTests { | ||
includeAndroidResources = true | ||
all { ignoreFailures = true } | ||
} | ||
} | ||
buildTypes { | ||
release { | ||
minifyEnabled false | ||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
lintOptions { | ||
disable 'MissingTranslation' | ||
} | ||
} | ||
} | ||
useLibrary 'org.apache.http.legacy' | ||
|
||
} | ||
|
||
dependencies { | ||
compile 'com.mcxiaoke.volley:library:1.0.19' | ||
compile 'com.android.support:appcompat-v7:27.0.2' | ||
compile 'com.android.support:design:27.0.2' | ||
testImplementation "junit:junit:$junitVersion" | ||
testImplementation "org.robolectric:robolectric:$robolectricVersion" | ||
testImplementation "org.assertj:assertj-core:$assertjVersion" | ||
testImplementation "org.mockito:mockito-core:$mockitoVersion" | ||
|
||
// Android Support | ||
implementation "androidx.appcompat:appcompat:$appCompatVersion" | ||
implementation "com.google.android.material:material:$appCompatVersion" | ||
implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion" | ||
implementation "androidx.core:core-ktx:$coreKtxVersion" | ||
implementation "androidx.fragment:fragment-ktx:$coreKtxVersion" | ||
|
||
// Dagger | ||
implementation "com.google.dagger:dagger-android:$daggerVersion" | ||
implementation "com.google.dagger:dagger-android-support:$daggerVersion" | ||
kapt "com.google.dagger:dagger-compiler:$daggerVersion" | ||
kapt "com.google.dagger:dagger-android-processor:$daggerVersion" | ||
implementation "com.github.bumptech.glide:glide:$glideVersion" | ||
kapt "com.github.bumptech.glide:compiler:$glideVersion" | ||
|
||
// Kotlin | ||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion" | ||
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion" | ||
|
||
// Logging | ||
implementation "de.psdev.slf4j-android-logger:slf4j-android-logger:$slf4jAndroidLoggerVersion" | ||
implementation "io.github.microutils:kotlin-logging:$kotlinLoggingVersion" | ||
|
||
// Moshi | ||
implementation "com.squareup.moshi:moshi:$moshiVersion" | ||
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" | ||
|
||
// OkHttp | ||
implementation "com.squareup.okhttp3:okhttp:$okhttpVersion" | ||
implementation "com.squareup.okhttp3:logging-interceptor:$okhttpVersion" | ||
implementation "com.squareup.okio:okio:$okioVersion" | ||
|
||
// Retrofit | ||
implementation "com.squareup.retrofit2:retrofit:$retrofitVersion" | ||
implementation "com.squareup.retrofit2:converter-moshi:$retrofitVersion" | ||
implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion" | ||
|
||
// RxJava | ||
implementation "io.reactivex.rxjava2:rxjava:$rxjavaVersion" | ||
implementation "io.reactivex.rxjava2:rxandroid:$rxandroidVersion" | ||
implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlinVersion" | ||
implementation "com.jakewharton.rx2:replaying-share-kotlin:$rxreplayingshareVersion" | ||
|
||
// SSDP Client | ||
implementation "io.resourcepool:ssdp-client:$ssdpclientVersion" | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
-renamesourcefileattribute SourceFile | ||
-keepattributes SourceFile,LineNumberTable | ||
|
||
-keepclassmembernames class kotlinx.** { | ||
volatile <fields>; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.