Photos

commit ab573ad2737b0df57f7479305aa245301c4ee34e Author: Ming Ming Date: Sat Apr 10 12:28:12 2021 +0800 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b20c6d9a --- /dev/null +++ b/.gitignore @@ -0,0 +1,47 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +.vscode/ +*.code-workspace + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Web related +lib/generated_plugin_registrant.dart + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/.metadata b/.metadata new file mode 100644 index 00000000..ccb00e6a --- /dev/null +++ b/.metadata @@ -0,0 +1,10 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: 8f89f6505b941329a864fef1527243a72800bf4d + channel: beta + +project_type: app diff --git a/README.md b/README.md new file mode 100644 index 00000000..cc457738 --- /dev/null +++ b/README.md @@ -0,0 +1,12 @@ +# Photos (for Nextcloud) +Photos (for Nextcloud) is a new gallery app for viewing your photos hosted on Nextcloud servers + +[ Google Play

](https://play.google.com/store/apps/details?id=com.nkming.nc_photos) + +Features: +- Sign-in to multiple servers +- EXIF support (JPEG only for now) +- Organize photos with albums that are independent of your file hierarchy +- and more to come! + +This app does not require any server-side plugins. diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 00000000..61739d94 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,14 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties + +/app/src/debug +/app/src/profile diff --git a/android/app/build.gradle b/android/app/build.gradle new file mode 100644 index 00000000..b984909a --- /dev/null +++ b/android/app/build.gradle @@ -0,0 +1,81 @@ +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterRoot = localProperties.getProperty('flutter.sdk') +if (flutterRoot == null) { + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +ext.abiCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86_64": 3] + +android { + compileSdkVersion 30 + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.nkming.nc_photos" + minSdkVersion 19 + targetSdkVersion 30 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + multiDexEnabled true + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. +// signingConfig signingConfigs.debug + } + } + + splits { + abi { + enable true + reset() + include "armeabi-v7a", "arm64-v8a", "x86_64" + universalApk true + } + } + + applicationVariants.all { variant -> + variant.outputs.each { output -> + def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(com.android.build.OutputFile.ABI)) + if (baseAbiVersionCode != null) { + output.versionCodeOverride = baseAbiVersionCode + variant.versionCode + } + } + } +} + +flutter { + source '../..' +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "androidx.multidex:multidex:2.0.1" +} diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro new file mode 100644 index 00000000..9db48d2d --- /dev/null +++ b/android/app/proguard-rules.pro @@ -0,0 +1,2 @@ +# To ensure that retracing stack traces is unambiguous +-keepattributes LineNumberTable,SourceFile diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..0ab9fa1e --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/kotlin/com/nkming/nc_photos/MainActivity.kt b/android/app/src/main/kotlin/com/nkming/nc_photos/MainActivity.kt new file mode 100644 index 00000000..caff3cde --- /dev/null +++ b/android/app/src/main/kotlin/com/nkming/nc_photos/MainActivity.kt @@ -0,0 +1,112 @@ +package com.nkming.nc_photos + +import android.Manifest +import android.app.Activity +import android.content.ContentValues +import android.content.pm.PackageManager +import android.os.Build +import android.os.Environment +import android.provider.MediaStore +import androidx.annotation.NonNull +import androidx.annotation.RequiresApi +import androidx.core.app.ActivityCompat +import androidx.core.content.ContextCompat +import io.flutter.embedding.android.FlutterActivity +import io.flutter.embedding.engine.FlutterEngine +import io.flutter.plugin.common.MethodCall +import io.flutter.plugin.common.MethodChannel +import java.io.BufferedOutputStream +import java.io.File +import java.io.FileOutputStream + +private const val PERMISSION_REQUEST_CODE = 11011 + +class MainActivity: FlutterActivity() { + override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { + super.configureFlutterEngine(flutterEngine) + MethodChannel(flutterEngine.dartExecutor.binaryMessenger, + MediaStoreChannelHandler.CHANNEL) + .setMethodCallHandler(MediaStoreChannelHandler(this)) + } +} + +class MediaStoreChannelHandler(activity: Activity) + : MethodChannel.MethodCallHandler { + companion object { + @JvmStatic + val CHANNEL = "com.nkming.nc_photos/media_store" + } + + override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) { + if (call.method == "saveFileToDownload") { + saveFileToDownload(call.argument("fileName")!!, + call.argument("content")!!, result) + } else { + result.notImplemented() + } + } + + private fun saveFileToDownload(fileName: String, content: ByteArray, + result: MethodChannel.Result) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + saveFileToDownload29(fileName, content, result) + } else { + saveFileToDownload0(fileName, content, result) + } + } + + @RequiresApi(Build.VERSION_CODES.Q) + private fun saveFileToDownload29(fileName: String, content: ByteArray, + result: MethodChannel.Result) { + // Add a media item that other apps shouldn't see until the item is + // fully written to the media store. + val resolver = _context.applicationContext.contentResolver + + // Find all audio files on the primary external storage device. + val collection = MediaStore.Downloads.getContentUri( + MediaStore.VOLUME_EXTERNAL_PRIMARY) + val details = ContentValues().apply { + put(MediaStore.Downloads.DISPLAY_NAME, fileName) + } + + val contentUri = resolver.insert(collection, details) + + resolver.openFileDescriptor(contentUri!!, "w", null).use { pfd -> + // Write data into the pending audio file. + BufferedOutputStream(FileOutputStream(pfd!!.fileDescriptor)).use { + stream -> stream.write(content) + } + } + result.success(null) + } + + private fun saveFileToDownload0(fileName: String, content: ByteArray, + result: MethodChannel.Result) { + if (ContextCompat.checkSelfPermission(_activity, + Manifest.permission.WRITE_EXTERNAL_STORAGE) + != PackageManager.PERMISSION_GRANTED) { + ActivityCompat.requestPermissions(_activity, + arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), + PERMISSION_REQUEST_CODE) + result.error("permissionError", "Permission not granted", null) + return + } + + val path = Environment.getExternalStoragePublicDirectory( + Environment.DIRECTORY_DOWNLOADS) + var file = File(path, fileName) + var count = 1 + while (file.exists()) { + val f = File(fileName) + file = File(path, "${f.nameWithoutExtension} ($count).${f.extension}") + ++count + } + BufferedOutputStream(FileOutputStream(file)).use { + stream -> stream.write(content) + } + result.success(null) + } + + private val _activity = activity + private val _context get() = _activity +} diff --git a/android/app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml b/android/app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml new file mode 100644 index 00000000..2cc6b075 --- /dev/null +++ b/android/app/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml @@ -0,0 +1,5 @@ + + + + diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 00000000..f74085f3 --- /dev/null +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 00000000..304732f8 --- /dev/null +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..3ba4e35c --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..cafe84bf Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..daabe3ef Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..81b92550 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..d0ad7910 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..2f63a745 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..1c077f8a Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..a76e1b8f Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..4ee70c4c Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..2f089a88 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..2528ce24 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 00000000..449a9f93 --- /dev/null +++ b/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..8da88ca0 --- /dev/null +++ b/android/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Photos + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..d74aa35c --- /dev/null +++ b/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/build.gradle b/android/build.gradle new file mode 100644 index 00000000..c505a863 --- /dev/null +++ b/android/build.gradle @@ -0,0 +1,31 @@ +buildscript { + ext.kotlin_version = '1.3.50' + repositories { + google() + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:4.1.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 00000000..94adc3a3 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..bc6a58af --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jun 23 08:50:38 CEST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip diff --git a/android/settings.gradle b/android/settings.gradle new file mode 100644 index 00000000..44e62bcf --- /dev/null +++ b/android/settings.gradle @@ -0,0 +1,11 @@ +include ':app' + +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() + +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/assets/2.0x/setup_hidden_pref_dir.png b/assets/2.0x/setup_hidden_pref_dir.png new file mode 100644 index 00000000..0c96fd98 Binary files /dev/null and b/assets/2.0x/setup_hidden_pref_dir.png differ diff --git a/assets/setup_hidden_pref_dir.png b/assets/setup_hidden_pref_dir.png new file mode 100644 index 00000000..1272d033 Binary files /dev/null and b/assets/setup_hidden_pref_dir.png differ diff --git a/l10n.yaml b/l10n.yaml new file mode 100644 index 00000000..15338f2d --- /dev/null +++ b/l10n.yaml @@ -0,0 +1,3 @@ +arb-dir: lib/l10n +template-arb-file: app_en.arb +output-localization-file: app_localizations.dart diff --git a/lib/account.dart b/lib/account.dart new file mode 100644 index 00000000..8f06dd0e --- /dev/null +++ b/lib/account.dart @@ -0,0 +1,76 @@ +import 'package:equatable/equatable.dart'; +import 'package:flutter/foundation.dart'; +import 'package:nc_photos/string_extension.dart'; + +/// Details of a remote Nextcloud server account +class Account with EquatableMixin { + Account( + this.scheme, + String address, + this.username, + this.password, + List roots, + ) : this.address = address.trimRightAny("/"), + _roots = roots.map((e) => e.trimRightAny("/")).toList() { + if (scheme != "http" && scheme != "https") { + throw FormatException("scheme is neither http or https"); + } + } + + Account copyWith({ + String scheme, + String address, + String username, + String password, + List roots, + }) { + return Account( + scheme ?? this.scheme, + address ?? this.address, + username ?? this.username, + password ?? this.password, + roots ?? _roots, + ); + } + + @override + toString() { + return "$runtimeType {" + "scheme: '$scheme', " + "address: '$address', " + "username: '$username', " + "password: '${password?.isNotEmpty == true ? (kDebugMode ? password : '***') : null}', " + "roots: List {'${roots.join('\', \'')}'}, " + "}"; + } + + Account.fromJson(Map json) + : scheme = json["scheme"], + address = json["address"], + username = json["username"], + password = json["password"], + _roots = json["roots"].cast(); + + Map toJson() => { + "scheme": scheme, + "address": address, + "username": username, + "password": password, + "roots": _roots, + }; + + @override + List