Media player fixes: better handling of RTL & orientation

Signed-off-by: Hardcore Sushi <hardcore.sushi@disroot.org>

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "app/libgocryptfs"]
 	path = app/libgocryptfs
 	url = https://forge.chapril.org/hardcoresushi/libgocryptfs.git
+[submodule "libpdfviewer"]
+	path = libpdfviewer
+	url = https://forge.chapril.org/hardcoresushi/libpdfviewer.git

README.md

@@ -8,7 +8,7 @@ It currently only works with [gocryptfs](https://github.com/rfjakob/gocryptfs) b
 <img src="https://forge.chapril.org/hardcoresushi/DroidFS/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" height="500">
 </p>
 
-# Disclamer
+# Disclaimer
 DroidFS is provided "as is", without any warranty of any kind.
 It shouldn't be considered as an absolute safe way to store files.
 DroidFS cannot protect you from screen recording apps, keyloggers, apk backdooring, compromised root accesses, memory dumps etc.
@@ -48,10 +48,10 @@ It is strongly recommended to read the documentation of a feature before enablin
 
 You can download DroidFS from [F-Droid](https://f-droid.org/packages/sushi.hardcore.droidfs) or from the "Releases" section in the repo. 
 
-APKs availables here are signed with my PGP key available on keyservers:
+APKs available here are signed with my PGP key available on keyservers:
 
-`gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 007F84120107191E` \
-Fingerprint: `BD5621479E7B74D36A405BE8007F84120107191E` \
+`gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys AFE384344A45E13A` \
+Fingerprint: `B64E FE86 CEE1 D054 F082  1711 AFE3 8434 4A45 E13A` \
 Email: `Hardcore Sushi <hardcore.sushi@disroot.org>`
 
 To verify APKs, save the PGP-signed message to a file and run `gpg --verify <the file>`.  __Don't install any APK if the verification fails !__
@@ -75,7 +75,10 @@ DroidFS need some permissions to work properly. Here is why:
   Required to encrypt/decrypt password hashes using a fingerprint protected key.
   </li>
   <li><h4>Camera:</h4>
-  Needed to take photos directly from DroidFS to import them securely. You can deny this permission if you don't want to use it.
+  Needed to take photos & videos directly encrypted inside DroidFS. You can deny this permission if you don't want to use it.
+  </li>
+  <li><h4>Record audio:</h4>
+  Required if you want sound on video recorded with DroidFS.
   </li>
 </ul>
 
@@ -85,60 +88,78 @@ DroidFS use some parts of the original gocryptfs code, which is designed to run
 # Build
 Most of the original gocryptfs code was used as is (written in Go) and compiled to native code. That's why you need [Go](https://golang.org) and the [Android Native Development Kit (NDK)](https://developer.android.com/ndk/) to build DroidFS from source.
 
-
-#### Install Requirements
-- [Android Studio](https://developer.android.com/studio/)
-- [Android NDK and CMake](https://developer.android.com/studio/projects/install-ndk) (OpenSSL build fails with NDK versions higher than v22. It should pass with NDK v21.4.7075529 and lower)
-- [Go](https://golang.org/doc/install) (on debian: `$ sudo apt-get install golang-go`)
-
-#### Download Sources
+#### Install dependencies
+On debian:
+```
+$ sudo apt-get install build-essential pkg-config libssl-dev
 ```
-$ git clone https://github.com/hardcore-sushi/DroidFS.git
+Install [Go](https://golang.org/doc/install):
 ```
-Download [libgocryptfs](https://forge.chapril.org/hardcoresushi/libgocryptfs):
+$ sudo apt-get install golang-go
 ```
+You also need to install the Android SDK build tools and the [Android NDK](https://developer.android.com/studio/projects/install-ndk).
+
+#### Download Sources
+```
+$ git clone --recurse-submodules https://github.com/hardcore-sushi/DroidFS.git
 $ cd DroidFS
-$ git submodule update --init
 ```
-libgocryptfs needs OpenSSL:
+[libgocryptfs](https://forge.chapril.org/hardcoresushi/libgocryptfs) needs OpenSSL:
 ```
 $ cd app/libgocryptfs
-$ wget https://www.openssl.org/source/openssl-1.1.1l.tar.gz
+$ wget https://www.openssl.org/source/openssl-1.1.1n.tar.gz
 ```
 Verify OpenSSL signature:
 ```
-$ wget https://www.openssl.org/source/openssl-1.1.1l.tar.gz.asc
-$ gpg --verify openssl-1.1.1l.tar.gz.asc openssl-1.1.1l.tar.gz
+$ wget https://www.openssl.org/source/openssl-1.1.1n.tar.gz.asc
+$ gpg --verify openssl-1.1.1n.tar.gz.asc openssl-1.1.1n.tar.gz
 ```
 Continue **ONLY** if the signature is **VALID**.
 ```
-$ tar -xvzf openssl-1.1.1l.tar.gz
+$ tar -xvzf openssl-1.1.1n.tar.gz
 ```
-
-#### Build
-First, we need to install some dependencies:
+DroidFS also need [FFmpeg](https://ffmpeg.org) to record encrypted video:
 ```
-$ sudo apt-get install libcrypto++-dev libssl-dev pkg-config
+$ cd app/ffmpeg
+$ git clone --depth=1 https://git.ffmpeg.org/ffmpeg.git
 ```
-And also Go dependencies:
+
+#### Generate a keystore
+APKs must be signed to be installed on an Android device. If you don't already have a keystore, you can generate one by running:
 ```
-$ go get golang.org/x/sys/unix golang.org/x/sys/cpu golang.org/x/crypto/hkdf github.com/jacobsa/crypto/siv github.com/rfjakob/eme
+$ keytool -genkey -keystore <output file> -alias <key alias> -keyalg EC -validity 10000
 ```
-Then, retrieve your Android NDK installation path, usually someting like "/home/\<user\>/Android/SDK/ndk/\<NDK version\>". We can now build libgocryptfs: 
+
+#### Build
+Retrieve your Android NDK installation path, usually something like "/home/\<user\>/Android/SDK/ndk/\<NDK version\>". Now you can build libgocryptfs:
 ```
 $ cd DroidFS/app/libgocryptfs
-$ env ANDROID_NDK_HOME="<your ndk path>" OPENSSL_PATH="./openssl-1.1.1l" ./build.sh
+$ env ANDROID_NDK_HOME="<your ndk path>" OPENSSL_PATH="./openssl-1.1.1n" ./build.sh
  ```
-Then, open the DroidFS project with Android Studio. \
-If a device (virtual or physical) is connected, just click on "Run". \
-If you want to generate a signed APK, you can follow this [post](https://stackoverflow.com/a/28938286).
+Then FFmpeg:
+```
+$ cd app/ffmpeg
+$ env ANDROID_NDK_HOME="<your ndk path>" ./build.sh ffmpeg
+```
+Finally, compile the app:
+```
+$ ./gradlew assembleRelease
+```
+If the build succeeds, you will find the unsigned APKs in `app/build/outputs/apk/release/`. You need to sign them in order to install the app:
+```
+$ apksigner sign --out droidfs.apk -v --ks <keystore> app/build/outputs/apk/release/<unsigned apk file>
+```
+Now you can install `droidfs.apk` on your device.
 
 # Third party code
 Thanks to these open source projects that DroidFS uses:
 
 ### Modified code:
-- [gocryptfs](https://github.com/rfjakob/gocryptfs) to encrypt your data
+- [libgocryptfs](https://forge.chapril.org/hardcoresushi/libgocryptfs) (forked from [gocryptfs](https://github.com/rfjakob/gocryptfs)) to encrypt your data
+- [libpdfviewer](https://forge.chapril.org/hardcoresushi/libpdfviewer) (forked from [PdfViewer](https://github.com/GrapheneOS/PdfViewer)) to open PDF files
+- [DoubleTapPlayerView](https://github.com/vkay94/DoubleTapPlayerView) to add double-click controls to the video player
+### Borrowed code:
+- [MaterialFiles](https://github.com/zhanghai/MaterialFiles) for kotlin natural sorting implementation
 ### Libraries:
-- [Cyanea](https://github.com/jaredrummler/Cyanea) to customize UI
 - [Glide](https://github.com/bumptech/glide/) to display pictures
 - [ExoPlayer](https://github.com/google/ExoPlayer) to play media files

app/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.10)
 
 add_library(
         gocryptfs
@@ -23,6 +23,56 @@ target_link_libraries(
         gocryptfs
 )
 
-include_directories(
-        ${PROJECT_SOURCE_DIR}/libgocryptfs/build/${ANDROID_ABI}/
+add_library(
+        avformat
+        SHARED
+        IMPORTED
+)
+
+set_target_properties(
+        avformat
+        PROPERTIES IMPORTED_LOCATION
+        ${PROJECT_SOURCE_DIR}/ffmpeg/build/${ANDROID_ABI}/libavformat/libavformat.so
+)
+
+add_library(
+        avcodec
+        SHARED
+        IMPORTED
 )
+
+set_target_properties(
+        avcodec
+        PROPERTIES IMPORTED_LOCATION
+        ${PROJECT_SOURCE_DIR}/ffmpeg/build/${ANDROID_ABI}/libavcodec/libavcodec.so
+)
+
+add_library(
+        avutil
+        SHARED
+        IMPORTED
+)
+
+set_target_properties(
+        avutil
+        PROPERTIES IMPORTED_LOCATION
+        ${PROJECT_SOURCE_DIR}/ffmpeg/build/${ANDROID_ABI}/libavutil/libavutil.so
+)
+
+add_library(
+        mux
+        SHARED
+        src/main/native/libmux.c
+)
+
+target_link_libraries(
+        mux
+        avformat
+        avcodec
+        avutil
+)
+
+include_directories(
+        ${PROJECT_SOURCE_DIR}/libgocryptfs/build/${ANDROID_ABI}
+        ${PROJECT_SOURCE_DIR}/ffmpeg/build/${ANDROID_ABI}
+)

app/build.gradle

@@ -2,9 +2,9 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-    ndkVersion "21.4.7075529"
+    compileSdkVersion 31
+    buildToolsVersion "31"
+    ndkVersion "23.1.7779620"
 
     compileOptions {
         targetCompatibility JavaVersion.VERSION_1_8
@@ -13,19 +13,22 @@ android {
     defaultConfig {
         applicationId "sushi.hardcore.droidfs"
         minSdkVersion 21
+        //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
-        versionCode 18
-        versionName "1.5.4"
+        versionCode 27
+        versionName "1.10.1"
 
         ndk {
             abiFilters "x86", "x86_64", "armeabi-v7a", "arm64-v8a"
         }
     }
 
-    splits {
-        abi {
-            enable true
-            universalApk true
+    if (!file("fdroid").exists()) {
+        splits {
+            abi {
+                enable true
+                universalApk true
+            }
         }
     }
 
@@ -53,27 +56,29 @@ android {
 }
 
 dependencies {
+    implementation project(":libpdfviewer:app")
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core-ktx:1.6.0"
-    implementation "androidx.appcompat:appcompat:1.3.1"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.0"
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation "androidx.appcompat:appcompat:1.4.1"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.3"
 
-    implementation "androidx.sqlite:sqlite-ktx:2.1.0"
-    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.sqlite:sqlite-ktx:2.2.0"
+    implementation "androidx.preference:preference-ktx:1.2.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "com.jaredrummler:cyanea:1.0.2"
+    implementation 'com.google.android.material:material:1.5.0'
     implementation "com.github.bumptech.glide:glide:4.12.0"
-    implementation "androidx.biometric:biometric:1.1.0"
+    implementation "androidx.biometric:biometric-ktx:1.2.0-alpha04"
 
-    def exoplayer_version = "2.15.0"
+    def exoplayer_version = "2.17.1"
     implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
     implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayer_version"
 
-    def camerax_v1 = "1.1.0-alpha08"
-    implementation "androidx.camera:camera-camera2:$camerax_v1"
-    implementation "androidx.camera:camera-lifecycle:$camerax_v1"
-    def camerax_v2 = "1.0.0-alpha28"
-    implementation "androidx.camera:camera-view:$camerax_v2"
-    implementation "androidx.camera:camera-extensions:$camerax_v2"
+    implementation "androidx.concurrent:concurrent-futures:1.1.0"
+
+    def camerax_version = "1.1.0-beta03"
+    implementation "androidx.camera:camera-camera2:$camerax_version"
+    implementation "androidx.camera:camera-lifecycle:$camerax_version"
+    implementation "androidx.camera:camera-view:$camerax_version"
+    implementation "androidx.camera:camera-extensions:$camerax_version"
 }

app/ffmpeg/.gitignore

@@ -0,0 +1,2 @@
+ffmpeg
+build

app/ffmpeg/build.sh

@@ -0,0 +1,94 @@
+#!/bin/bash
+
+if [ -z ${ANDROID_NDK_HOME+x} ]; then
+	echo "Error: \$ANDROID_NDK_HOME is not defined." >&2
+	exit 1
+elif [ $# -lt 1 ]; then
+	echo "Usage: $0 <FFmpeg source directory> [<ABI>]" >&2
+	exit 1
+else
+	FFMPEG_DIR=$1
+	compile_for_arch() {
+		echo "Compiling for $1..."
+		case $1 in
+			"x86_64")
+				CFN="x86_64-linux-android21-clang"
+				ARCH="x86_64"
+				;;
+			"x86")
+				CFN="i686-linux-android21-clang"
+				ARCH="i686"
+				EXTRA_FLAGS="--disable-asm"
+				;;
+			"arm64-v8a")
+				CFN="aarch64-linux-android21-clang"
+				ARCH="aarch64"
+				;;
+			"armeabi-v7a")
+				CFN="armv7a-linux-androideabi19-clang"
+				ARCH="arm"
+				;;
+		esac
+		(cd $FFMPEG_DIR && make clean;
+		./configure \
+			--cc="$CFN" \
+			--cxx="$CFN++" \
+			--arch="$ARCH" \
+			$EXTRA_FLAGS \
+			--target-os=android \
+			--enable-cross-compile \
+			--enable-version3 \
+			--disable-programs \
+			--disable-static \
+			--enable-shared \
+			--disable-bsfs \
+			--disable-parsers \
+			--disable-demuxers \
+			--disable-muxers \
+			--enable-muxer="mp4" \
+			--disable-decoders \
+			--disable-encoders \
+			--enable-encoder="aac" \
+			--disable-avdevice \
+			--disable-swresample \
+			--disable-swscale \
+			--disable-postproc \
+			--disable-avfilter \
+			--disable-network \
+			--disable-doc \
+			--disable-htmlpages \
+			--disable-manpages \
+			--disable-podpages \
+			--disable-txtpages \
+			--disable-sndio \
+			--disable-schannel \
+			--disable-securetransport \
+			--disable-xlib \
+			--disable-zlib \
+			--disable-cuvid \
+			--disable-nvenc \
+			--disable-vdpau \
+			--disable-videotoolbox \
+			--disable-audiotoolbox \
+			--disable-appkit \
+			--disable-alsa \
+			--disable-debug \
+			>/dev/null &&
+		make -j $(nproc --all) >/dev/null) &&
+		mkdir -p build/$1/libavformat build/$1/libavcodec build/$1/libavutil &&
+		cp $FFMPEG_DIR/libavformat/*.h $FFMPEG_DIR/libavformat/libavformat.so build/$1/libavformat &&
+		cp $FFMPEG_DIR/libavcodec/*.h $FFMPEG_DIR/libavcodec/libavcodec.so build/$1/libavcodec &&
+		cp $FFMPEG_DIR/libavutil/*.h $FFMPEG_DIR/libavutil/libavutil.so build/$1/libavutil ||
+		exit 1
+	}
+
+	export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
+	if [ $# -eq 2 ]; then
+		compile_for_arch $2
+	else
+		declare -a ABIs=("x86_64" "x86" "arm64-v8a" "armeabi-v7a")
+		for abi in ${ABIs[@]}; do
+			compile_for_arch $abi
+		done
+	fi
+fi

app/libgocryptfs

@@ -1 +1 @@
-Subproject commit f0e45c7b7e428f13667edd3b8d73501e15322a04
+Subproject commit 9e98192442b08362660b45f4e2e50221ba7bc65b

app/proguard-rules.pro

@@ -25,3 +25,7 @@
 -keepclassmembers class sushi.hardcore.droidfs.explorers.ExplorerElement {
     static sushi.hardcore.droidfs.explorers.ExplorerElement new(...);
 }
+-keepclassmembers class sushi.hardcore.droidfs.video_recording.MediaMuxer {
+    void writePacket(byte[]);
+    void seek(long);
+}

app/src/main/AndroidManifest.xml

@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <uses-feature
         android:name="android.hardware.camera.any"
@@ -24,67 +25,36 @@
         tools:node="remove" /> <!--removing this permission automatically added by exoplayer-->
 
     <application
-        android:name=".ColoredApplication"
         android:allowBackup="false"
         android:icon="@mipmap/icon_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity
-            android:name=".CameraActivity"
-            android:screenOrientation="nosensor" />
-        <activity
-            android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings"
-            android:parentActivityName=".MainActivity" />
-        <activity android:name=".explorers.ExplorerActivity" />
-        <activity android:name=".explorers.ExplorerActivityPick" />
-        <activity android:name=".explorers.ExplorerActivityDrop" />
-        <activity
-            android:name=".OpenActivity"
-            android:parentActivityName=".MainActivity"
-            android:screenOrientation="nosensor"
-            android:windowSoftInputMode="adjustPan">
+        android:theme="@style/BaseTheme">
+        <activity android:name=".MainActivity" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
             <intent-filter android:label="@string/share_menu_label">
                 <action android:name="android.intent.action.SEND" />
                 <action android:name="android.intent.action.SEND_MULTIPLE" />
-
                 <category android:name="android.intent.category.DEFAULT" />
-
                 <data android:mimeType="*/*" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".CreateActivity"
-            android:parentActivityName=".MainActivity"
-            android:screenOrientation="nosensor" />
-        <activity
-            android:name=".ChangePasswordActivity"
-            android:parentActivityName=".MainActivity"
-            android:screenOrientation="nosensor"
-            android:windowSoftInputMode="adjustPan" />
-        <activity
-            android:name=".MainActivity"
-            android:screenOrientation="nosensor">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".file_viewers.ImageViewer"
-            android:configChanges="screenSize|orientation" /> <!-- don't reload content on configuration change -->
-        <activity
-            android:name=".file_viewers.VideoPlayer"
-            android:configChanges="screenSize|orientation" />
-        <activity
-            android:name=".file_viewers.AudioPlayer"
-            android:configChanges="screenSize|orientation" />
-        <activity
-            android:name=".file_viewers.TextEditor"
-            android:configChanges="screenSize|orientation" />
+        <activity android:name=".SettingsActivity" android:label="@string/title_activity_settings"/>
+        <activity android:name=".add_volume.AddVolumeActivity" android:windowSoftInputMode="adjustResize"/>
+        <activity android:name=".ChangePasswordActivity"  android:windowSoftInputMode="adjustResize"/>
+        <activity android:name=".explorers.ExplorerActivity"/>
+        <activity android:name=".explorers.ExplorerActivityPick"/>
+        <activity android:name=".explorers.ExplorerActivityDrop"/>
+        <activity android:name=".file_viewers.ImageViewer" android:configChanges="screenSize|orientation" /> <!-- don't reload content on configuration change -->
+        <activity android:name=".file_viewers.VideoPlayer" android:configChanges="screenSize|orientation" />
+        <activity android:name=".file_viewers.PdfViewer" android:configChanges="screenSize|orientation" />
+        <activity android:name=".file_viewers.AudioPlayer" android:configChanges="screenSize|orientation" />
+        <activity android:name=".file_viewers.TextEditor" android:configChanges="screenSize|orientation" />
+        <activity android:name=".CameraActivity" android:screenOrientation="nosensor" />
 
         <service android:name=".file_operations.FileOperationService" android:exported="false"/>
 

app/src/main/java/sushi/hardcore/droidfs/BaseActivity.kt

@@ -3,36 +3,51 @@ package sushi.hardcore.droidfs
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.WindowManager
-import androidx.core.content.ContextCompat
+import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.PreferenceManager
-import com.jaredrummler.cyanea.app.CyaneaAppCompatActivity
-import sushi.hardcore.droidfs.widgets.ThemeColor
 
-open class BaseActivity: CyaneaAppCompatActivity() {
+open class BaseActivity: AppCompatActivity() {
     protected lateinit var sharedPrefs: SharedPreferences
-    protected var isRecreating = false
+    lateinit var themeValue: String
+    private var shouldCheckTheme = true
+
     override fun onCreate(savedInstanceState: Bundle?) {
-        val themeColor = ThemeColor.getThemeColor(this)
-        if (cyanea.accent != themeColor){
-            changeThemeColor(themeColor)
+        sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this)
+        if (shouldCheckTheme) {
+            themeValue = sharedPrefs.getString("theme", ConstValues.DEFAULT_THEME_VALUE)!!
+            when (themeValue) {
+                "black_green" -> setTheme(R.style.BlackGreen)
+                "dark_red" -> setTheme(R.style.DarkRed)
+                "black_red" -> setTheme(R.style.BlackRed)
+                "dark_blue" -> setTheme(R.style.DarkBlue)
+                "black_blue" -> setTheme(R.style.BlackBlue)
+                "dark_yellow" -> setTheme(R.style.DarkYellow)
+                "black_yellow" -> setTheme(R.style.BlackYellow)
+                "dark_orange" -> setTheme(R.style.DarkOrange)
+                "black_orange" -> setTheme(R.style.BlackOrange)
+                "dark_purple" -> setTheme(R.style.DarkPurple)
+                "black_purple" -> setTheme(R.style.BlackPurple)
+            }
+        } else {
+            shouldCheckTheme = true
         }
         super.onCreate(savedInstanceState)
-        sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this)
         if (!sharedPrefs.getBoolean("usf_screenshot", false)){
             window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
         }
     }
-    fun changeThemeColor(themeColor: Int? = null){
-        val accentColor = themeColor ?: ThemeColor.getThemeColor(this)
-        val backgroundColor = ContextCompat.getColor(this, R.color.backgroundColor)
-        isRecreating = true
-        cyanea.edit{
-            accent(accentColor)
-            //accentDark(themeColor)
-            //accentLight(themeColor)
-            background(backgroundColor)
-            //backgroundDark(backgroundColor)
-            //backgroundLight(backgroundColor)
-        }.recreate(this)
+
+    override fun onStart() {
+        super.onStart()
+        val newThemeValue = sharedPrefs.getString("theme", "dark_green")!!
+        onThemeChanged(newThemeValue)
+    }
+
+    fun onThemeChanged(newThemeValue: String) {
+        if (newThemeValue != themeValue) {
+            themeValue = newThemeValue
+            shouldCheckTheme = false
+            recreate()
+        }
     }
 }

app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt

@@ -1,6 +1,7 @@
 package sushi.hardcore.droidfs
 
 import android.Manifest
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageManager
 import android.hardware.camera2.CameraCharacteristics
@@ -9,28 +10,31 @@ import android.os.Build
 import android.os.Bundle
 import android.text.InputType
 import android.util.Size
-import android.view.MotionEvent
-import android.view.ScaleGestureDetector
-import android.view.View
-import android.view.WindowManager
+import android.view.*
 import android.view.animation.Animation
 import android.view.animation.LinearInterpolator
 import android.view.animation.RotateAnimation
-import android.widget.EditText
 import android.widget.ImageView
 import android.widget.RelativeLayout
 import android.widget.Toast
+import androidx.annotation.RequiresApi
 import androidx.camera.camera2.interop.Camera2CameraInfo
 import androidx.camera.core.*
 import androidx.camera.extensions.ExtensionMode
 import androidx.camera.extensions.ExtensionsManager
 import androidx.camera.lifecycle.ProcessCameraProvider
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import sushi.hardcore.droidfs.adapters.DialogSingleChoiceAdapter
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import sushi.hardcore.droidfs.content_providers.RestrictedFileProvider
 import sushi.hardcore.droidfs.databinding.ActivityCameraBinding
 import sushi.hardcore.droidfs.util.PathUtils
-import sushi.hardcore.droidfs.widgets.ColoredAlertDialogBuilder
+import sushi.hardcore.droidfs.video_recording.SeekableWriter
+import sushi.hardcore.droidfs.video_recording.VideoCapture
+import sushi.hardcore.droidfs.widgets.CustomAlertDialogBuilder
+import sushi.hardcore.droidfs.widgets.EditTextDialog
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.text.SimpleDateFormat
@@ -39,7 +43,8 @@ import java.util.concurrent.Executor
 
 class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
     companion object {
-        private const val CAMERA_PERMISSION_REQUEST_CODE = 1
+        private const val CAMERA_PERMISSION_REQUEST_CODE = 0
+        private const val AUDIO_PERMISSION_REQUEST_CODE = 1
         private const val fileNameRandomMin = 100000
         private const val fileNameRandomMax = 999999
         private val dateFormat = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US)
@@ -61,19 +66,25 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
     private lateinit var orientedIcons: List<ImageView>
     private lateinit var gocryptfsVolume: GocryptfsVolume
     private lateinit var outputDirectory: String
-    private lateinit var fileName: String
     private var isFinishingIntentionally = false
+    private var isAskingPermissions = false
     private var permissionsGranted = false
     private lateinit var executor: Executor
     private lateinit var cameraProvider: ProcessCameraProvider
     private lateinit var extensionsManager: ExtensionsManager
+    private lateinit var cameraSelector: CameraSelector
     private val cameraPreview = Preview.Builder().build()
     private var imageCapture: ImageCapture? = null
+    private var videoCapture: VideoCapture? = null
     private var camera: Camera? = null
     private var resolutions: List<Size>? = null
     private var currentResolutionIndex: Int = 0
+    private var currentResolution: Size? = null
     private var captureMode = ImageCapture.CAPTURE_MODE_MAXIMIZE_QUALITY
     private var isBackCamera = true
+    private var isInVideoMode = false
+    private var isRecording = false
+    private var isWaitingForTimer = false
     private lateinit var binding: ActivityCameraBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -81,13 +92,15 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
         usf_keep_open = sharedPrefs.getBoolean("usf_keep_open", false)
         binding = ActivityCameraBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        gocryptfsVolume = GocryptfsVolume(intent.getIntExtra("sessionID", -1))
+        supportActionBar?.hide()
+        gocryptfsVolume = GocryptfsVolume(applicationContext, intent.getIntExtra("sessionID", -1))
         outputDirectory = intent.getStringExtra("path")!!
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED){
                 permissionsGranted = true
             } else {
+                isAskingPermissions = true
                 requestPermissions(arrayOf(Manifest.permission.CAMERA), CAMERA_PERMISSION_REQUEST_CODE)
             }
         } else {
@@ -99,13 +112,12 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
         ProcessCameraProvider.getInstance(this).apply {
             addListener({
                 cameraProvider = get()
-                setupCamera()
-            }, executor)
-        }
-        ExtensionsManager.getInstance(this).apply {
-            addListener({
-                extensionsManager = get()
-                setupCamera()
+                ExtensionsManager.getInstanceAsync(this@CameraActivity, cameraProvider).apply {
+                    addListener({
+                        extensionsManager = get()
+                        setupCamera()
+                    }, executor)
+                }
             }, executor)
         }
 
@@ -115,9 +127,9 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
             } else {
                 1
             }
-            ColoredAlertDialogBuilder(this)
+            CustomAlertDialogBuilder(this, themeValue)
                 .setTitle(R.string.camera_optimization)
-                .setSingleChoiceItems(DialogSingleChoiceAdapter(this, arrayOf(R.string.maximize_quality, R.string.minimize_latency).map { getString(it) }), currentIndex) { dialog, which ->
+                .setSingleChoiceItems(arrayOf(getString(R.string.maximize_quality), getString(R.string.minimize_latency)), currentIndex) { dialog, which ->
                     val resId: Int
                     val newCaptureMode = if (which == 0) {
                         resId = R.drawable.icon_high_quality
@@ -129,7 +141,11 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
                     if (newCaptureMode != captureMode) {
                         captureMode = newCaptureMode
                         binding.imageCaptureMode.setImageResource(resId)
-                        setupCamera()
+                        if (!isInVideoMode) {
+                            cameraProvider.unbind(imageCapture)
+                            refreshImageCapture()
+                            cameraProvider.bindToLifecycle(this, cameraSelector, imageCapture)
+                        }
                     }
                     dialog.dismiss()
                 }
@@ -138,60 +154,84 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
         }
         binding.imageRatio.setOnClickListener {
             resolutions?.let {
-                ColoredAlertDialogBuilder(this)
+                CustomAlertDialogBuilder(this, themeValue)
                     .setTitle(R.string.choose_resolution)
-                    .setSingleChoiceItems(DialogSingleChoiceAdapter(this, it.map { size -> size.toString() }), currentResolutionIndex) { dialog, which ->
-                        setupCamera(resolutions!![which])
-                        dialog.dismiss()
+                    .setSingleChoiceItems(it.map { size -> size.toString() }.toTypedArray(), currentResolutionIndex) { dialog, which ->
+                        currentResolution = resolutions!![which]
                         currentResolutionIndex = which
+                        setupCamera()
+                        dialog.dismiss()
                     }
                     .setNegativeButton(R.string.cancel, null)
                     .show()
             }
         }
         binding.imageTimer.setOnClickListener {
-            val dialogEditTextView = layoutInflater.inflate(R.layout.dialog_edit_text, null)
-            val dialogEditText = dialogEditTextView.findViewById<EditText>(R.id.dialog_edit_text)
-            dialogEditText.inputType = InputType.TYPE_CLASS_NUMBER
-            val dialog = ColoredAlertDialogBuilder(this)
-                .setView(dialogEditTextView)
-                .setTitle(getString(R.string.enter_timer_duration))
-                .setPositiveButton(R.string.ok) { _, _ ->
-                    val enteredValue = dialogEditText.text.toString()
-                    if (enteredValue.isEmpty()){
-                        Toast.makeText(this, getString(R.string.timer_empty_error_msg), Toast.LENGTH_SHORT).show()
-                    } else {
-                        timerDuration = enteredValue.toInt()
-                    }
+            with (EditTextDialog(this, R.string.enter_timer_duration) {
+                try {
+                    timerDuration = it.toInt()
+                } catch (e: NumberFormatException) {
+                    Toast.makeText(this, R.string.invalid_number, Toast.LENGTH_SHORT).show()
                 }
-                .setNegativeButton(R.string.cancel, null)
-                .create()
-            dialogEditText.setOnEditorActionListener { _, _, _ ->
-                timerDuration = dialogEditText.text.toString().toInt()
-                dialog.dismiss()
-                true
+            }) {
+                binding.dialogEditText.inputType = InputType.TYPE_CLASS_NUMBER
+                show()
             }
-            dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
-            dialog.show()
-        }
-        binding.imageClose.setOnClickListener {
-            isFinishingIntentionally = true
-            finish()
         }
         binding.imageFlash.setOnClickListener {
-            binding.imageFlash.setImageResource(when (imageCapture?.flashMode) {
-                ImageCapture.FLASH_MODE_AUTO -> {
-                    imageCapture?.flashMode = ImageCapture.FLASH_MODE_ON
-                    R.drawable.icon_flash_on
+            binding.imageFlash.setImageResource(if (isInVideoMode) {
+                when (imageCapture?.flashMode) {
+                    ImageCapture.FLASH_MODE_ON -> {
+                        camera?.cameraControl?.enableTorch(false)
+                        imageCapture?.flashMode = ImageCapture.FLASH_MODE_OFF
+                        R.drawable.icon_flash_off
+                    }
+                    else -> {
+                        camera?.cameraControl?.enableTorch(true)
+                        imageCapture?.flashMode = ImageCapture.FLASH_MODE_ON
+                        R.drawable.icon_flash_on
+                    }
                 }
-                ImageCapture.FLASH_MODE_ON -> {
-                    imageCapture?.flashMode = ImageCapture.FLASH_MODE_OFF
-                    R.drawable.icon_flash_off
+            } else {
+                when (imageCapture?.flashMode) {
+                    ImageCapture.FLASH_MODE_AUTO -> {
+                        imageCapture?.flashMode = ImageCapture.FLASH_MODE_ON
+                        R.drawable.icon_flash_on
+                    }
+                    ImageCapture.FLASH_MODE_ON -> {
+                        imageCapture?.flashMode = ImageCapture.FLASH_MODE_OFF
+                        R.drawable.icon_flash_off
+                    }
+                    else -> {
+                        imageCapture?.flashMode = ImageCapture.FLASH_MODE_AUTO
+                        R.drawable.icon_flash_auto
+                    }
                 }
-                else -> {
-                    imageCapture?.flashMode = ImageCapture.FLASH_MODE_AUTO
-                    R.drawable.icon_flash_auto
+            })
+        }
+        binding.imageModeSwitch.setOnClickListener {
+            isInVideoMode = !isInVideoMode
+            setupCamera()
+            binding.imageFlash.setImageResource(if (isInVideoMode) {
+                binding.recordVideoButton.visibility = View.VISIBLE
+                binding.takePhotoButton.visibility = View.GONE
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    if (ActivityCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
+                        isAskingPermissions = true
+                        requestPermissions(arrayOf(Manifest.permission.RECORD_AUDIO), AUDIO_PERMISSION_REQUEST_CODE)
+                    }
                 }
+                binding.imageModeSwitch.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.icon_photo)?.mutate()?.also {
+                    it.setTint(ContextCompat.getColor(this, R.color.neutralIconTint))
+                })
+                imageCapture?.flashMode = ImageCapture.FLASH_MODE_OFF
+                R.drawable.icon_flash_off
+            } else {
+                binding.recordVideoButton.visibility = View.GONE
+                binding.takePhotoButton.visibility = View.VISIBLE
+                binding.imageModeSwitch.setImageResource(R.drawable.icon_video)
+                imageCapture?.flashMode = ImageCapture.FLASH_MODE_AUTO
+                R.drawable.icon_flash_auto
             })
         }
         binding.imageCameraSwitch.setOnClickListener {
@@ -200,12 +240,19 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
                 false
             } else {
                 binding.imageCameraSwitch.setImageResource(R.drawable.icon_camera_front)
+                if (isInVideoMode) {
+                    //reset flash state
+                    imageCapture?.flashMode = ImageCapture.FLASH_MODE_OFF
+                    binding.imageFlash.setImageResource(R.drawable.icon_flash_off)
+                }
                 true
             }
+            resolutions = null
             setupCamera()
         }
         binding.takePhotoButton.onClick = ::onClickTakePhoto
-        orientedIcons = listOf(binding.imageRatio, binding.imageTimer, binding.imageClose, binding.imageFlash, binding.imageCameraSwitch)
+        binding.recordVideoButton.setOnClickListener { onClickRecordVideo() }
+        orientedIcons = listOf(binding.imageRatio, binding.imageTimer, binding.imageCaptureMode, binding.imageFlash, binding.imageModeSwitch, binding.imageCameraSwitch)
         sensorOrientationListener = SensorOrientationListener(this)
 
         val scaleGestureDetector = ScaleGestureDetector(this, object : ScaleGestureDetector.SimpleOnScaleGestureListener(){
@@ -232,15 +279,17 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.M)
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        when (requestCode) {
-            CAMERA_PERMISSION_REQUEST_CODE -> if (grantResults.size == 1) {
-                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+        isAskingPermissions = false
+        if (grantResults.size == 1) {