diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..b0adff1 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +ssfilestack \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a163f2c --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..f4698dc --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..f41a9e1 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,50 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + compileSdk 31 + + defaultConfig { + applicationId "ua.motionman.ssfilestack" + minSdk 28 + targetSdk 31 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + buildFeatures { + viewBinding = true + } +} + +dependencies { + implementation fileTree(include: ['*.jar'], dir: 'libs') + + // filestack + implementation project(':filestack') + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/ua/motionman/ssfilestack/ExampleInstrumentedTest.kt b/app/src/androidTest/java/ua/motionman/ssfilestack/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..b6a9c2c --- /dev/null +++ b/app/src/androidTest/java/ua/motionman/ssfilestack/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package ua.motionman.ssfilestack + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("ua.motionman.ssfilestack", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..c00a9e2 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/ua/motionman/ssfilestack/MainActivity.kt b/app/src/main/java/ua/motionman/ssfilestack/MainActivity.kt new file mode 100644 index 0000000..6c28376 --- /dev/null +++ b/app/src/main/java/ua/motionman/ssfilestack/MainActivity.kt @@ -0,0 +1,50 @@ +package ua.motionman.ssfilestack + +import android.content.Intent +import android.os.Bundle +import android.util.Log +import androidx.appcompat.app.AppCompatActivity +import ua.motionman.filestack.ui.FilestackActivity +import ua.motionman.ssfilestack.databinding.ActivityMainBinding + +class MainActivity : AppCompatActivity() { + + private lateinit var binding: ActivityMainBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + binding = ActivityMainBinding.inflate(layoutInflater) + val view = binding.root + setContentView(view) + + binding.filestack.setOnClickListener { + handleFilstackNavigation() + } + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) + + if (requestCode == 662 && resultCode == RESULT_OK) { + val result = data?.getBooleanExtra("IS_COMPLETE", false) + Log.e("MainActivity", "onActivityResult: $result") + } + } + + private fun handleFilstackNavigation() { + Intent(this, FilestackActivity::class.java).apply { + putExtra(FilestackActivity.API_KEY, "AEHrSDUikTDqTbYuRTesYz") + putExtra( + FilestackActivity.POLICY_KEY, + "eyJjYWxsIjogWyJyZWFkIiwgImNvbnZlcnQiLCAicGljayIsICJzdG9yZSJdLCAiZXhwaXJ5IjogMTY1ODg2NzU3My41MzYzNDYsICJtYXhTaXplIjogNTM2ODcwOTEyMH0=" + ) + putExtra( + FilestackActivity.SIGNATURE_KEY, + "b8c29b5e7041775e28132e41b30d409571ffde6c7713d8b3afc3640f7db73864" + ) + startActivityForResult(this, 662) +// startActivity(this) + } + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..e0a31cb --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..3ed343b --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..ce838ab --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + ssfilestack + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..9c098dd --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/ua/motionman/ssfilestack/ExampleUnitTest.kt b/app/src/test/java/ua/motionman/ssfilestack/ExampleUnitTest.kt new file mode 100644 index 0000000..68978a0 --- /dev/null +++ b/app/src/test/java/ua/motionman/ssfilestack/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package ua.motionman.ssfilestack + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..02e3213 --- /dev/null +++ b/build.gradle @@ -0,0 +1,10 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '4.2.2' apply false + id 'com.android.library' version '4.2.2' apply false + id 'org.jetbrains.kotlin.android' version '1.6.10' apply false +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/filestack/.gitignore b/filestack/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/filestack/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/filestack/build.gradle b/filestack/build.gradle new file mode 100644 index 0000000..967457f --- /dev/null +++ b/filestack/build.gradle @@ -0,0 +1,66 @@ +plugins { + id 'com.android.library' + id 'org.jetbrains.kotlin.android' +} + +android { + compileSdkVersion 32 + + defaultConfig { + minSdkVersion 28 + targetSdkVersion 32 + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles "consumer-rules.pro" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + buildFeatures { + viewBinding = true + } +} + +dependencies { + // filestack java + implementation("com.github.KagasiraBunJee:filestack-java:0.10.4") + + // core + implementation("androidx.core:core-ktx:1.7.0") + implementation("androidx.appcompat:appcompat:1.4.2") + implementation("com.google.android.material:material:1.6.1") + implementation("androidx.fragment:fragment-ktx:1.5.0") + + // navigation + def navigationVersion = '2.5.0' + implementation("androidx.navigation:navigation-fragment-ktx:$navigationVersion") + implementation("androidx.navigation:navigation-ui-ktx:$navigationVersion") + + // rx java + implementation("io.reactivex.rxjava2:rxandroid:2.1.0") + + // camera + def cameraxVersion = "1.1.0-beta01" + implementation("androidx.camera:camera-core:${cameraxVersion}") + implementation("androidx.camera:camera-camera2:${cameraxVersion}") + implementation("androidx.camera:camera-lifecycle:${cameraxVersion}") + implementation("androidx.camera:camera-video:${cameraxVersion}") + implementation("androidx.camera:camera-view:${cameraxVersion}") + implementation("androidx.camera:camera-extensions:${cameraxVersion}") + + // tests + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.3") + androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0") +} \ No newline at end of file diff --git a/filestack/consumer-rules.pro b/filestack/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/filestack/proguard-rules.pro b/filestack/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/filestack/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/filestack/src/androidTest/java/ua/motionman/filestack/ExampleInstrumentedTest.kt b/filestack/src/androidTest/java/ua/motionman/filestack/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..39eaf04 --- /dev/null +++ b/filestack/src/androidTest/java/ua/motionman/filestack/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package ua.motionman.filestack + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("ua.motionman.filestack.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/filestack/src/main/AndroidManifest.xml b/filestack/src/main/AndroidManifest.xml new file mode 100644 index 0000000..0e59637 --- /dev/null +++ b/filestack/src/main/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/filestack/src/main/java/ua/motionman/filestack/domain/model/Selection.kt b/filestack/src/main/java/ua/motionman/filestack/domain/model/Selection.kt new file mode 100644 index 0000000..13d5294 --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/domain/model/Selection.kt @@ -0,0 +1,11 @@ +package ua.motionman.filestack.domain.model + +import java.io.Serializable + +data class Selection( + val provider: String, + val uri: String, + val size: Int, + val mimeType: String, + val name: String +) : Serializable diff --git a/filestack/src/main/java/ua/motionman/filestack/domain/model/Source.kt b/filestack/src/main/java/ua/motionman/filestack/domain/model/Source.kt new file mode 100644 index 0000000..631436c --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/domain/model/Source.kt @@ -0,0 +1,9 @@ +package ua.motionman.filestack.domain.model + +import androidx.annotation.StringRes + +sealed class SourceModel { + data class Header(@StringRes val section: Int) : SourceModel() + + data class Source(val type: String, @StringRes val name: Int) : SourceModel() +} diff --git a/filestack/src/main/java/ua/motionman/filestack/ui/ContainerActivity.kt b/filestack/src/main/java/ua/motionman/filestack/ui/ContainerActivity.kt new file mode 100644 index 0000000..9a80e47 --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/ui/ContainerActivity.kt @@ -0,0 +1,31 @@ +package ua.motionman.filestack.ui + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import ua.motionman.filestack.R +import ua.motionman.filestack.utils.client.ClientProvider + +class FilestackActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.container_activity) + + initClient() + } + + private fun initClient() { + val apiKey = intent?.getStringExtra(API_KEY) + val policy = intent?.getStringExtra(POLICY_KEY) + val signature = intent?.getStringExtra(SIGNATURE_KEY) + + if (!apiKey.isNullOrEmpty() && !policy.isNullOrEmpty() && !signature.isNullOrEmpty()) { + ClientProvider.instance.initClient(apiKey, policy, signature) + } + } + + companion object { + const val API_KEY = "api_key" + const val POLICY_KEY = "policy_key" + const val SIGNATURE_KEY = "signature_key" + } +} \ No newline at end of file diff --git a/filestack/src/main/java/ua/motionman/filestack/ui/camera/CameraFragment.kt b/filestack/src/main/java/ua/motionman/filestack/ui/camera/CameraFragment.kt new file mode 100644 index 0000000..8a9333a --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/ui/camera/CameraFragment.kt @@ -0,0 +1,120 @@ +package ua.motionman.filestack.ui.camera + +import android.Manifest +import android.content.pm.PackageManager +import android.os.Build +import android.os.Bundle +import android.view.View +import android.view.View.GONE +import android.view.View.VISIBLE +import androidx.activity.result.contract.ActivityResultContracts +import androidx.core.content.ContextCompat +import androidx.fragment.app.Fragment +import androidx.navigation.fragment.findNavController +import ua.motionman.filestack.R +import ua.motionman.filestack.databinding.CameraFragmentBinding +import ua.motionman.filestack.ui.uploadingprogress.UploadingProgressFragment.Companion.SELECTIONS_KEY +import ua.motionman.filestack.utils.camera.CameraProvider +import ua.motionman.filestack.utils.delegate.viewBinding +import ua.motionman.filestack.utils.extensions.processUri + +class CameraFragment : Fragment(R.layout.camera_fragment) { + + private val binding by viewBinding(CameraFragmentBinding::bind) + + private val cameraProvider = CameraProvider() + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + checkForPermission() + setupListeners() + } + + private fun checkForPermission() { + if (allPermissionsGranted()) { + startCamera() + } else { + permissionLauncher.launch(REQUIRED_PERMISSIONS) + } + } + + private fun setupListeners() { + with(binding.cameraControlLayout) { + takePhotoButton.setOnClickListener { takePhoto() } + switchCameraSelector.setOnClickListener { + cameraProvider.switchSelector() + startCamera() + } + cancelShotButton.setOnClickListener { findNavController().navigateUp() } + } + + with(binding.imagePreviewControlLayout) { + retakePhotoButton.setOnClickListener { + binding.cameraContainer.visibility = VISIBLE + binding.previewContainer.visibility = GONE + startCamera() + } + usePhotoButton.setOnClickListener { + val capture = cameraProvider.getImageUri().toString() + val selection = capture.processUri(requireContext()) + + findNavController().navigate(R.id.cameraToUpload, Bundle().apply { + putSerializable(SELECTIONS_KEY, arrayOf(selection)) + }) + } + } + } + + private fun startCamera() { + cameraProvider.startCamera( + requireContext(), + this, + binding.cameraPreviewView.surfaceProvider + ) + } + + private fun takePhoto() { + cameraProvider.takePhoto( + requireContext(), + onError = {}, + onImageSaved = { + with(binding) { + cameraContainer.visibility = GONE + previewContainer.visibility = VISIBLE + photoPreview.setImageURI(it.savedUri) + } + } + ) + } + + private fun allPermissionsGranted() = REQUIRED_PERMISSIONS.all { + ContextCompat.checkSelfPermission( + requireContext(), it + ) == PackageManager.PERMISSION_GRANTED + } + + private val permissionLauncher = registerForActivityResult( + ActivityResultContracts.RequestMultiplePermissions() + ) { + if (allPermissionsGranted()) { + startCamera() + } else { + findNavController().navigateUp() + } + } + + override fun onDestroy() { + super.onDestroy() + cameraProvider.onDestroy() + } + + companion object { + private val REQUIRED_PERMISSIONS = + mutableListOf(Manifest.permission.CAMERA).apply { + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) { + add(Manifest.permission.WRITE_EXTERNAL_STORAGE) + } + }.toTypedArray() + } +} \ No newline at end of file diff --git a/filestack/src/main/java/ua/motionman/filestack/ui/filestacksources/SourcesAdapter.kt b/filestack/src/main/java/ua/motionman/filestack/ui/filestacksources/SourcesAdapter.kt new file mode 100644 index 0000000..af5810c --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/ui/filestacksources/SourcesAdapter.kt @@ -0,0 +1,80 @@ +package ua.motionman.filestack.ui.filestacksources + +import android.view.ViewGroup +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.ListAdapter +import androidx.recyclerview.widget.RecyclerView +import ua.motionman.filestack.databinding.SourceItemBinding +import ua.motionman.filestack.databinding.SourceSectionBinding +import ua.motionman.filestack.domain.model.SourceModel +import ua.motionman.filestack.utils.delegate.viewBinding + +typealias SourceSelected = (SourceModel.Source) -> Unit + +class SourcesAdapter(private val onSelect: SourceSelected) : + ListAdapter(SourcesDiffCallback()) { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + return when (viewType) { + VIEW_TYPE_SECTION -> SourceSectionViewHolder(parent.viewBinding(SourceSectionBinding::inflate)) + VIEW_TYPE_SOURCES -> SourceViewHolder(parent.viewBinding(SourceItemBinding::inflate)) + else -> throw IllegalArgumentException() + } + } + + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + when (holder) { + is SourceSectionViewHolder -> holder.bind(getItem(position) as SourceModel.Header) + is SourceViewHolder -> holder.bind(getItem(position) as SourceModel.Source) + } + } + + override fun getItemViewType(position: Int): Int { + return when (getItem(position)) { + is SourceModel.Header -> VIEW_TYPE_SECTION + is SourceModel.Source -> VIEW_TYPE_SOURCES + } + } + + + inner class SourceViewHolder(private val binding: SourceItemBinding) : + RecyclerView.ViewHolder(binding.root) { + fun bind(item: SourceModel.Source) { + with(binding) { + root.setOnClickListener { onSelect(item) } + sourceNameTextView.text = itemView.context.getText(item.name) + } + } + } + + inner class SourceSectionViewHolder(private val binding: SourceSectionBinding) : + RecyclerView.ViewHolder(binding.root) { + fun bind(section: SourceModel.Header) { + binding.sourceSectionTextView.text = itemView.context.getText(section.section) + } + } + + companion object { + const val VIEW_TYPE_SECTION = 0 + const val VIEW_TYPE_SOURCES = 1 + } +} + +class SourcesDiffCallback : DiffUtil.ItemCallback() { + override fun areItemsTheSame(oldItem: SourceModel, newItem: SourceModel): Boolean { + return when { + oldItem is SourceModel.Header && newItem is SourceModel.Header -> oldItem.section == newItem.section + oldItem is SourceModel.Source && newItem is SourceModel.Source -> oldItem.type == newItem.type + else -> false + } + } + + override fun areContentsTheSame(oldItem: SourceModel, newItem: SourceModel): Boolean { + return when { + oldItem is SourceModel.Header && newItem is SourceModel.Header -> oldItem.section == newItem.section + oldItem is SourceModel.Source && newItem is SourceModel.Source -> { + oldItem.type == newItem.type + } + else -> false + } + } +} diff --git a/filestack/src/main/java/ua/motionman/filestack/ui/filestacksources/SourcesFragment.kt b/filestack/src/main/java/ua/motionman/filestack/ui/filestacksources/SourcesFragment.kt new file mode 100644 index 0000000..f8299b7 --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/ui/filestacksources/SourcesFragment.kt @@ -0,0 +1,97 @@ +package ua.motionman.filestack.ui.filestacksources + +import android.app.Activity +import android.content.Intent +import android.os.Bundle +import android.view.View +import androidx.activity.result.ActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.fragment.app.Fragment +import androidx.navigation.fragment.findNavController +import com.filestack.Sources +import ua.motionman.filestack.R +import ua.motionman.filestack.databinding.SourcesFragmentBinding +import ua.motionman.filestack.domain.model.SourceModel +import ua.motionman.filestack.ui.uploadingprogress.UploadingProgressFragment.Companion.SELECTIONS_KEY +import ua.motionman.filestack.utils.delegate.viewBinding +import ua.motionman.filestack.utils.extensions.toSelection +import ua.motionman.filestack.utils.source.localSourceData + +class SourcesFragment : Fragment(R.layout.sources_fragment) { + + private val binding by viewBinding(SourcesFragmentBinding::bind) + + private val onSourceSelected: SourceSelected = { handleSourceSelected(it) } + + private val sourceAdapter = SourcesAdapter(onSourceSelected) + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + handleArguments() + setToolbarTitle() + initAdapter() + + sourceAdapter.submitList(localSourceData) + } + + private fun handleArguments() { + arguments?.getBoolean(COMPLETE_UPLOAD_KEY)?.let { isComplete -> + if (isComplete) { + val intent = Intent().apply { + putExtra("IS_COMPLETE", isComplete) + } + activity?.setResult(Activity.RESULT_OK, intent) + activity?.finish() + return + } + } + } + + private fun setToolbarTitle() { + binding.sourcesToolbar.toolbarTitleTextView.text = getText(R.string.source_title) + } + + private fun initAdapter() { + binding.sourcesRecyclerView.apply { + adapter = sourceAdapter + } + } + + private fun handleSourceSelected(source: SourceModel.Source) { + when (source.type) { + Sources.DEVICE -> proceedWithDeviceContentPicker() + Sources.CAMERA -> proceedWithCamera() + } + } + + private val startForResult = + registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult -> + if (result.resultCode == Activity.RESULT_OK) { + findNavController().navigate(R.id.sourcesToUploading, Bundle().apply { + putSerializable(SELECTIONS_KEY, result.toSelection(requireContext())) + }) + } + } + + private fun proceedWithDeviceContentPicker() { + val mimeTypes: Array = arrayOf("application/pdf", "video/*", "image/*") + + Intent(Intent.ACTION_OPEN_DOCUMENT).apply { + addCategory(Intent.CATEGORY_OPENABLE) + putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true) + type = "*/*" + putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes) + }.also { + startForResult.launch(it) + } + } + + private fun proceedWithCamera() { + findNavController().navigate(R.id.sourceToCamera) + } + + companion object { + const val COMPLETE_UPLOAD_KEY = "complete_upload" + } +} \ No newline at end of file diff --git a/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressFragment.kt b/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressFragment.kt new file mode 100644 index 0000000..50dea01 --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressFragment.kt @@ -0,0 +1,74 @@ +package ua.motionman.filestack.ui.uploadingprogress + +import android.os.Bundle +import android.view.View +import androidx.activity.addCallback +import androidx.fragment.app.Fragment +import androidx.fragment.app.viewModels +import androidx.lifecycle.lifecycleScope +import androidx.navigation.fragment.findNavController +import ua.motionman.filestack.R +import ua.motionman.filestack.databinding.UploadingProgressBinding +import ua.motionman.filestack.domain.model.Selection +import ua.motionman.filestack.ui.filestacksources.SourcesFragment.Companion.COMPLETE_UPLOAD_KEY +import ua.motionman.filestack.utils.delegate.viewBinding + +class UploadingProgressFragment : Fragment(R.layout.uploading_progress) { + + private val binding by viewBinding(UploadingProgressBinding::bind) + + private val vm: UploadingProgressViewModel by viewModels() + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + setupListeners() + initFlowSubscriber() + startUploadService() + disableOnBackPress() + } + + private fun setupListeners() { + binding.cancelButton.setOnClickListener { handleOnFinish(false) } + } + + private fun initFlowSubscriber() { + lifecycleScope.launchWhenStarted { + vm.viewState.collect { state -> + updateUi(state) + if (state.isUploadFinish) handleOnFinish(true) + } + } + } + + private fun updateUi(state: UploadingState) { + with(binding) { + progressBar.setProgress(state.progress, true) + uploadingTitle.text = + String.format("Uploaded files: %d/%d", state.currentFile, state.totalFiles) + } + } + + private fun startUploadService() { + val selections = arguments?.getSerializable(SELECTIONS_KEY) as? Array + vm.uploadSelections(selections, requireContext().contentResolver) + } + + private fun handleOnFinish(isComplete: Boolean) { + vm.cancelUpload() + findNavController().navigate(R.id.uploadingToSources, Bundle().apply { + putBoolean(COMPLETE_UPLOAD_KEY, isComplete) + }) + } + + private fun disableOnBackPress() { + activity?.onBackPressedDispatcher?.addCallback { + // do nothing + } + } + + companion object { + const val SELECTIONS_KEY = "selections_bundle_key" + } + +} \ No newline at end of file diff --git a/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressViewModel.kt b/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressViewModel.kt new file mode 100644 index 0000000..17ccd73 --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressViewModel.kt @@ -0,0 +1,105 @@ +package ua.motionman.filestack.ui.uploadingprogress + +import android.content.ContentResolver +import android.net.Uri +import android.util.Log +import androidx.lifecycle.ViewModel +import com.filestack.FileLink +import com.filestack.Progress +import com.filestack.StorageOptions +import io.reactivex.Flowable +import io.reactivex.disposables.Disposable +import io.reactivex.schedulers.Schedulers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import ua.motionman.filestack.domain.model.Selection +import ua.motionman.filestack.utils.client.ClientProvider + +data class UploadingState( + val currentFile: Int = 0, + val totalFiles: Int = 0, + val progress: Int = 0, + val isUploadFinish: Boolean = false +) + +class UploadingProgressViewModel : ViewModel() { + + private val _viewState = MutableStateFlow(UploadingState()) + val viewState = _viewState.asStateFlow() + + private var disposable = mutableListOf() + + private var currentFile = 0 + + fun uploadSelections( + data: Array?, + contentResolver: ContentResolver + ) { + if (data.isNullOrEmpty()) return + + updateViewState(_viewState.value.copy(totalFiles = data.size)) + + data.forEach { upload(it, contentResolver) } + } + + private fun upload( + selection: Selection, + contentResolver: ContentResolver + ) { + val client = ClientProvider.instance.getClient() ?: return + + val storeOptions = StorageOptions.Builder() + .filename(selection.name) + .mimeType(selection.mimeType) + .build() + + val upload: Flowable> = client.uploadAsync( + contentResolver.openInputStream(Uri.parse(selection.uri)), + selection.size, + false, + storeOptions + ) + + disposable.add( + upload + .subscribeOn(Schedulers.io()) + .doOnNext { updateProgress(it) } + .doOnComplete { proceedOnComplete() } + .doOnError { Log.e("SourceFragment", "doOnError $it") } + .subscribe() + ) + } + + private fun updateProgress(currentProgress: Progress) { + updateViewState( + _viewState.value.copy( + progress = calculateProgress(currentFile, currentProgress.percent), + ) + ) + } + + private fun calculateProgress(file: Int, percent: Double): Int { + val size = file + percent + return (size / _viewState.value.totalFiles * 100).toInt() + } + + private fun proceedOnComplete() { + currentFile++ + updateViewState( + _viewState.value.copy( + currentFile = currentFile, + isUploadFinish = currentFile >= _viewState.value.totalFiles + ) + ) + } + + private fun updateViewState(value: UploadingState) { + _viewState.value = value + } + + fun cancelUpload() { + disposable.forEach { it.dispose() } + disposable.clear() + } + +} \ No newline at end of file diff --git a/filestack/src/main/java/ua/motionman/filestack/utils/camera/CameraProvider.kt b/filestack/src/main/java/ua/motionman/filestack/utils/camera/CameraProvider.kt new file mode 100644 index 0000000..35b9ae1 --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/utils/camera/CameraProvider.kt @@ -0,0 +1,125 @@ +package ua.motionman.filestack.utils.camera + +import android.content.ContentValues +import android.content.Context +import android.net.Uri +import android.os.Build +import android.provider.MediaStore +import android.util.Log +import androidx.camera.core.CameraSelector +import androidx.camera.core.ImageCapture +import androidx.camera.core.ImageCaptureException +import androidx.camera.core.Preview +import androidx.camera.lifecycle.ProcessCameraProvider +import androidx.core.content.ContextCompat +import androidx.lifecycle.LifecycleOwner +import ua.motionman.filestack.utils.extensions.switchSelector +import java.text.SimpleDateFormat +import java.util.* + +class CameraProvider { + private var imageCapture: ImageCapture? = null + private var preview: Preview? = null + private var cameraProvider: ProcessCameraProvider? = null + private var cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA + private var imageUri: Uri? = null + + fun startCamera( + context: Context, + lifecycleOwner: LifecycleOwner, + surfaceProvider: Preview.SurfaceProvider + ) { + val cameraProviderFuture = ProcessCameraProvider.getInstance(context) + + cameraProviderFuture.addListener({ + // Used to bind the lifecycle of cameras to the lifecycle owner + cameraProvider = cameraProviderFuture.get() + + // Preview + preview = Preview.Builder() + .build() + .also { + it.setSurfaceProvider(surfaceProvider) + } + + imageCapture = ImageCapture.Builder() + .build() + + try { + // Unbind use cases before rebinding + cameraProvider?.unbindAll() + + // Bind use cases to camera + cameraProvider?.bindToLifecycle( + lifecycleOwner, cameraSelector, preview, imageCapture + ) + + } catch (exc: Exception) { + Log.e("CameraFragment", "Use case binding failed", exc) + } + + }, ContextCompat.getMainExecutor(context)) + } + + fun takePhoto( + context: Context, + onError: (ImageCaptureException) -> Unit, + onImageSaved: (ImageCapture.OutputFileResults) -> Unit + ) { + // Get a stable reference of the modifiable image capture use case + val imageCapture = imageCapture ?: return + + // Create time stamped name and MediaStore entry. + val name = SimpleDateFormat(FILENAME_FORMAT, Locale.US) + .format(System.currentTimeMillis()) + val contentValues = ContentValues().apply { + put(MediaStore.MediaColumns.DISPLAY_NAME, name) + put(MediaStore.MediaColumns.MIME_TYPE, "image/jpeg") + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) { + put(MediaStore.Images.Media.RELATIVE_PATH, "Pictures/SmartSuite") + } + } + // Create output options object which contains file + metadata + val outputOptions = ImageCapture.OutputFileOptions + .Builder( + context.contentResolver, + MediaStore.Images.Media.EXTERNAL_CONTENT_URI, + contentValues + ) + .build() + + cameraProvider?.unbind(preview) + // Set up image capture listener, which is triggered after photo has + // been taken + imageCapture.takePicture( + outputOptions, + ContextCompat.getMainExecutor(context), + object : ImageCapture.OnImageSavedCallback { + override fun onError(exc: ImageCaptureException) { + onError(exc) + } + + override fun onImageSaved(output: ImageCapture.OutputFileResults) { + imageUri = output.savedUri + onImageSaved(output) + } + } + ) + } + + fun switchSelector() { + cameraSelector = cameraSelector.switchSelector() + } + + fun getImageUri(): Uri? { + return imageUri + } + + fun onDestroy() { + cameraProvider?.unbind(preview) + } + + companion object { + private const val FILENAME_FORMAT = "yyyy-MM-dd-HH-mm-ss-SSS" + } +} \ No newline at end of file diff --git a/filestack/src/main/java/ua/motionman/filestack/utils/client/ClientProvider.kt b/filestack/src/main/java/ua/motionman/filestack/utils/client/ClientProvider.kt new file mode 100644 index 0000000..6fb5f8d --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/utils/client/ClientProvider.kt @@ -0,0 +1,23 @@ +package ua.motionman.filestack.utils.client + +import com.filestack.Client +import com.filestack.Config + +class ClientProvider { + + private var client: Client? = null + + fun initClient(apiKey: String, policy: String, signature: String) { + val config = Config(apiKey, policy, signature) + client = Client(config) + } + + fun getClient(): Client? { + return client + } + + companion object { + val instance = ClientProvider() + } + +} \ No newline at end of file diff --git a/filestack/src/main/java/ua/motionman/filestack/utils/delegate/ViewBindingDelegates.kt b/filestack/src/main/java/ua/motionman/filestack/utils/delegate/ViewBindingDelegates.kt new file mode 100644 index 0000000..311e0e0 --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/utils/delegate/ViewBindingDelegates.kt @@ -0,0 +1,50 @@ +package ua.motionman.filestack.utils.delegate + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity +import androidx.fragment.app.DialogFragment +import androidx.fragment.app.Fragment +import androidx.lifecycle.DefaultLifecycleObserver +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleOwner +import androidx.viewbinding.ViewBinding +import kotlin.properties.ReadOnlyProperty +import kotlin.reflect.KProperty + +/** Activity binding delegate, may be used since onCreate up to onDestroy (inclusive) */ +inline fun AppCompatActivity.viewBinding(crossinline factory: (LayoutInflater) -> T) = + lazy(LazyThreadSafetyMode.NONE) { + factory(layoutInflater) + } + +/** Fragment binding delegate, may be used since onViewCreated up to onDestroyView (inclusive) */ +fun Fragment.viewBinding(factory: (View) -> T): ReadOnlyProperty = + object : ReadOnlyProperty, DefaultLifecycleObserver { + private var binding: T? = null + + override fun getValue(thisRef: Fragment, property: KProperty<*>): T = + binding ?: factory(requireView()).also { + // if binding is accessed after Lifecycle is DESTROYED, create new instance, but don't cache it + if (viewLifecycleOwner.lifecycle.currentState.isAtLeast(Lifecycle.State.INITIALIZED)) { + viewLifecycleOwner.lifecycle.addObserver(this) + binding = it + } + } + + override fun onDestroy(owner: LifecycleOwner) { + binding = null + } + } + +/** Binding delegate for DialogFragments implementing onCreateDialog (like Activities, they don't + * have a separate view lifecycle), may be used since onCreateDialog up to onDestroy (inclusive) */ +inline fun DialogFragment.viewBinding(crossinline factory: (LayoutInflater) -> T) = + lazy(LazyThreadSafetyMode.NONE) { + factory(layoutInflater) + } + +/** Not really a delegate, just a small helper for RecyclerView.ViewHolders */ +inline fun ViewGroup.viewBinding(factory: (LayoutInflater, ViewGroup, Boolean) -> T) = + factory(LayoutInflater.from(context), this, false) \ No newline at end of file diff --git a/filestack/src/main/java/ua/motionman/filestack/utils/extensions/ActivityResultExtension.kt b/filestack/src/main/java/ua/motionman/filestack/utils/extensions/ActivityResultExtension.kt new file mode 100644 index 0000000..27f838a --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/utils/extensions/ActivityResultExtension.kt @@ -0,0 +1,24 @@ +package ua.motionman.filestack.utils.extensions + +import android.content.ClipData +import android.content.Context +import androidx.activity.result.ActivityResult +import ua.motionman.filestack.domain.model.Selection + +fun ActivityResult.toSelection(context: Context): Array { + val clipData: ClipData? = this.data?.clipData + val data = this.data?.dataString + + if (clipData != null) { + return List(clipData.itemCount) { 0 }.mapIndexed { index, _ -> + clipData.getItemAt(index).uri.toString().processUri(context) + }.filterNotNull().toTypedArray() + } + + val selection = data?.processUri(context) + if (selection != null) { + return arrayOf(selection) + } + + return emptyArray() +} \ No newline at end of file diff --git a/filestack/src/main/java/ua/motionman/filestack/utils/extensions/CameraExtension.kt b/filestack/src/main/java/ua/motionman/filestack/utils/extensions/CameraExtension.kt new file mode 100644 index 0000000..a0285b8 --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/utils/extensions/CameraExtension.kt @@ -0,0 +1,11 @@ +package ua.motionman.filestack.utils.extensions + +import androidx.camera.core.CameraSelector + +fun CameraSelector.switchSelector(): CameraSelector { + return when (this) { + CameraSelector.DEFAULT_BACK_CAMERA -> CameraSelector.DEFAULT_FRONT_CAMERA + CameraSelector.DEFAULT_FRONT_CAMERA -> CameraSelector.DEFAULT_BACK_CAMERA + else -> CameraSelector.DEFAULT_BACK_CAMERA + } +} \ No newline at end of file diff --git a/filestack/src/main/java/ua/motionman/filestack/utils/extensions/UriExtension.kt b/filestack/src/main/java/ua/motionman/filestack/utils/extensions/UriExtension.kt new file mode 100644 index 0000000..0469c58 --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/utils/extensions/UriExtension.kt @@ -0,0 +1,31 @@ +package ua.motionman.filestack.utils.extensions + +import android.content.Context +import android.net.Uri +import android.provider.OpenableColumns +import com.filestack.Sources +import ua.motionman.filestack.domain.model.Selection + +fun String.processUri(context: Context): Selection? { + val uri = Uri.parse(this) + + val cursor = context.contentResolver.query( + uri, + null, + null, + null, + null + ) ?: return null + + cursor.moveToFirst() + + val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME) + val sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE) + + val fileName = cursor.getString(nameIndex) + val fileSize = cursor.getInt(sizeIndex) + val mimeType = context.contentResolver.getType(uri) ?: "" + + cursor.close() + return Selection(Sources.DEVICE, this, fileSize, mimeType, fileName) +} \ No newline at end of file diff --git a/filestack/src/main/java/ua/motionman/filestack/utils/source/SourceData.kt b/filestack/src/main/java/ua/motionman/filestack/utils/source/SourceData.kt new file mode 100644 index 0000000..60b56c9 --- /dev/null +++ b/filestack/src/main/java/ua/motionman/filestack/utils/source/SourceData.kt @@ -0,0 +1,29 @@ +package ua.motionman.filestack.utils.source + +import com.filestack.Sources +import ua.motionman.filestack.R +import ua.motionman.filestack.domain.model.SourceModel + +val localSources = listOf( + SourceModel.Source(Sources.DEVICE, R.string.source_device), + SourceModel.Source(Sources.CAMERA, R.string.source_camera) +) + +val localSourceData = listOf(SourceModel.Header(R.string.source_local)) + localSources + +val remoteSources = listOf( + SourceModel.Source(Sources.DEVICE, R.string.source_facebook), + SourceModel.Source(Sources.CAMERA, R.string.source_instagram), + SourceModel.Source(Sources.CAMERA, R.string.source_google_drive), + SourceModel.Source(Sources.CAMERA, R.string.source_dropbox), + SourceModel.Source(Sources.CAMERA, R.string.source_box), + SourceModel.Source(Sources.CAMERA, R.string.source_github), + SourceModel.Source(Sources.CAMERA, R.string.source_gmail), + SourceModel.Source(Sources.CAMERA, R.string.source_google_photos), + SourceModel.Source(Sources.CAMERA, R.string.source_onedrive), + SourceModel.Source(Sources.CAMERA, R.string.source_amazon_drive) +) + +val remoteSourceData = listOf(SourceModel.Header(R.string.source_remote)) + remoteSources + +val allSourceData = localSourceData + remoteSourceData \ No newline at end of file diff --git a/filestack/src/main/res/drawable/curved_progress_bar.xml b/filestack/src/main/res/drawable/curved_progress_bar.xml new file mode 100644 index 0000000..5c181cb --- /dev/null +++ b/filestack/src/main/res/drawable/curved_progress_bar.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/filestack/src/main/res/drawable/ic_arrow_right.xml b/filestack/src/main/res/drawable/ic_arrow_right.xml new file mode 100644 index 0000000..33f2717 --- /dev/null +++ b/filestack/src/main/res/drawable/ic_arrow_right.xml @@ -0,0 +1,10 @@ + + + diff --git a/filestack/src/main/res/drawable/ic_camera_shot.xml b/filestack/src/main/res/drawable/ic_camera_shot.xml new file mode 100644 index 0000000..4a77cd1 --- /dev/null +++ b/filestack/src/main/res/drawable/ic_camera_shot.xml @@ -0,0 +1,5 @@ + + + diff --git a/filestack/src/main/res/drawable/ic_camera_switch_selector.xml b/filestack/src/main/res/drawable/ic_camera_switch_selector.xml new file mode 100644 index 0000000..9e8ac18 --- /dev/null +++ b/filestack/src/main/res/drawable/ic_camera_switch_selector.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/filestack/src/main/res/layout/camera_bottom_control.xml b/filestack/src/main/res/layout/camera_bottom_control.xml new file mode 100644 index 0000000..24d1c59 --- /dev/null +++ b/filestack/src/main/res/layout/camera_bottom_control.xml @@ -0,0 +1,35 @@ + + + + + + + + + \ No newline at end of file diff --git a/filestack/src/main/res/layout/camera_fragment.xml b/filestack/src/main/res/layout/camera_fragment.xml new file mode 100644 index 0000000..3144a7a --- /dev/null +++ b/filestack/src/main/res/layout/camera_fragment.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/filestack/src/main/res/layout/container_activity.xml b/filestack/src/main/res/layout/container_activity.xml new file mode 100644 index 0000000..d3bb59e --- /dev/null +++ b/filestack/src/main/res/layout/container_activity.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/filestack/src/main/res/layout/image_preview_bottom_control.xml b/filestack/src/main/res/layout/image_preview_bottom_control.xml new file mode 100644 index 0000000..402751b --- /dev/null +++ b/filestack/src/main/res/layout/image_preview_bottom_control.xml @@ -0,0 +1,30 @@ + + + + + + + \ No newline at end of file diff --git a/filestack/src/main/res/layout/source_item.xml b/filestack/src/main/res/layout/source_item.xml new file mode 100644 index 0000000..44e843c --- /dev/null +++ b/filestack/src/main/res/layout/source_item.xml @@ -0,0 +1,30 @@ + + + + + + + + \ No newline at end of file diff --git a/filestack/src/main/res/layout/source_section.xml b/filestack/src/main/res/layout/source_section.xml new file mode 100644 index 0000000..fb0026f --- /dev/null +++ b/filestack/src/main/res/layout/source_section.xml @@ -0,0 +1,25 @@ + + + + + + + + \ No newline at end of file diff --git a/filestack/src/main/res/layout/sources_fragment.xml b/filestack/src/main/res/layout/sources_fragment.xml new file mode 100644 index 0000000..038d16a --- /dev/null +++ b/filestack/src/main/res/layout/sources_fragment.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/filestack/src/main/res/layout/toolbar.xml b/filestack/src/main/res/layout/toolbar.xml new file mode 100644 index 0000000..3ea920b --- /dev/null +++ b/filestack/src/main/res/layout/toolbar.xml @@ -0,0 +1,29 @@ + + + + + + + + + + diff --git a/filestack/src/main/res/layout/uploading_progress.xml b/filestack/src/main/res/layout/uploading_progress.xml new file mode 100644 index 0000000..645d327 --- /dev/null +++ b/filestack/src/main/res/layout/uploading_progress.xml @@ -0,0 +1,40 @@ + + + + + + + + + + \ No newline at end of file diff --git a/filestack/src/main/res/navigation/nav_graph.xml b/filestack/src/main/res/navigation/nav_graph.xml new file mode 100644 index 0000000..1faef40 --- /dev/null +++ b/filestack/src/main/res/navigation/nav_graph.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/filestack/src/main/res/values-night/colors.xml b/filestack/src/main/res/values-night/colors.xml new file mode 100644 index 0000000..2af6d7c --- /dev/null +++ b/filestack/src/main/res/values-night/colors.xml @@ -0,0 +1,18 @@ + + + #FF3A86FF + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + + #FFFFFFFF + #FF9096A0 + #FFFF5757 + #FF494A4D + #FF202123 + + \ No newline at end of file diff --git a/filestack/src/main/res/values/colors.xml b/filestack/src/main/res/values/colors.xml new file mode 100644 index 0000000..de9b7aa --- /dev/null +++ b/filestack/src/main/res/values/colors.xml @@ -0,0 +1,18 @@ + + + #FF3A86FF + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + + #FF2E3538 + #FF828D9E + #FFFF5757 + #FFCBD9DF + #FFFFFFFF + + \ No newline at end of file diff --git a/filestack/src/main/res/values/strings.xml b/filestack/src/main/res/values/strings.xml new file mode 100644 index 0000000..875816e --- /dev/null +++ b/filestack/src/main/res/values/strings.xml @@ -0,0 +1,32 @@ + + + + Filestack + + Local + Camera + Device + + Remote + Facebook + Instagram + Google Drive + Dropbox + Box + GitHub + Gmail + Google Photos + OneDrive + Amazon Drive + + + + Uploading + Cancel + + + + Retake + Use Photo + + \ No newline at end of file diff --git a/filestack/src/main/res/values/themes.xml b/filestack/src/main/res/values/themes.xml new file mode 100644 index 0000000..0a35789 --- /dev/null +++ b/filestack/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/filestack/src/test/java/ua/motionman/filestack/ExampleUnitTest.kt b/filestack/src/test/java/ua/motionman/filestack/ExampleUnitTest.kt new file mode 100644 index 0000000..b119871 --- /dev/null +++ b/filestack/src/test/java/ua/motionman/filestack/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package ua.motionman.filestack + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..cd0519b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,23 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..470b65e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Jul 24 09:49:48 EEST 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..1d9f2f1 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,19 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + maven { url "https://jitpack.io" } + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { url "https://jitpack.io" } + } +} +rootProject.name = "ssfilestack" +include ':app' +include ':filestack'