diff --git a/settings.gradle b/settings.gradle index edaef4fdaf..705c94a677 100644 --- a/settings.gradle +++ b/settings.gradle @@ -35,8 +35,8 @@ include ':lintchecks' include ':paging' include ':paging-app' include ':core-util' +include ':core-util-jvm' include ':glide-config' -include ':video' include ':device-transfer' include ':device-transfer-app' include ':image-editor' @@ -56,10 +56,10 @@ include ':photoview' include ':core-ui' include ':benchmark' include ':microbenchmark' +include ':video' include ':video-app' include ':glide-webp' include ':glide-webp-app' -include ':core-util-jvm' project(':app').name = 'Signal-Android' project(':paging').projectDir = file('paging/lib') @@ -86,6 +86,9 @@ project(':contacts-app').projectDir = file('contacts/app') project(':qr').projectDir = file('qr/lib') project(':qr-app').projectDir = file('qr/app') +project(':video').projectDir = file('video/lib') +project(':video-app').projectDir = file('video/app') + project(':glide-webp').projectDir = file('glide-webp/lib') project(':glide-webp-app').projectDir = file('glide-webp/app') diff --git a/video-app/.gitignore b/video/app/.gitignore similarity index 100% rename from video-app/.gitignore rename to video/app/.gitignore diff --git a/video-app/build.gradle.kts b/video/app/build.gradle.kts similarity index 100% rename from video-app/build.gradle.kts rename to video/app/build.gradle.kts diff --git a/video-app/proguard-rules.pro b/video/app/proguard-rules.pro similarity index 100% rename from video-app/proguard-rules.pro rename to video/app/proguard-rules.pro diff --git a/video-app/src/androidTest/java/org/thoughtcrime/video/app/ExampleInstrumentedTest.kt b/video/app/src/androidTest/java/org/thoughtcrime/video/app/ExampleInstrumentedTest.kt similarity index 100% rename from video-app/src/androidTest/java/org/thoughtcrime/video/app/ExampleInstrumentedTest.kt rename to video/app/src/androidTest/java/org/thoughtcrime/video/app/ExampleInstrumentedTest.kt diff --git a/video-app/src/main/AndroidManifest.xml b/video/app/src/main/AndroidManifest.xml similarity index 100% rename from video-app/src/main/AndroidManifest.xml rename to video/app/src/main/AndroidManifest.xml diff --git a/video-app/src/main/java/org/thoughtcrime/video/app/MainActivity.kt b/video/app/src/main/java/org/thoughtcrime/video/app/MainActivity.kt similarity index 100% rename from video-app/src/main/java/org/thoughtcrime/video/app/MainActivity.kt rename to video/app/src/main/java/org/thoughtcrime/video/app/MainActivity.kt diff --git a/video-app/src/main/java/org/thoughtcrime/video/app/MainScreenViewModel.kt b/video/app/src/main/java/org/thoughtcrime/video/app/MainScreenViewModel.kt similarity index 100% rename from video-app/src/main/java/org/thoughtcrime/video/app/MainScreenViewModel.kt rename to video/app/src/main/java/org/thoughtcrime/video/app/MainScreenViewModel.kt diff --git a/video-app/src/main/java/org/thoughtcrime/video/app/SlowDataSource.kt b/video/app/src/main/java/org/thoughtcrime/video/app/SlowDataSource.kt similarity index 100% rename from video-app/src/main/java/org/thoughtcrime/video/app/SlowDataSource.kt rename to video/app/src/main/java/org/thoughtcrime/video/app/SlowDataSource.kt diff --git a/video-app/src/main/java/org/thoughtcrime/video/app/ui/theme/Color.kt b/video/app/src/main/java/org/thoughtcrime/video/app/ui/theme/Color.kt similarity index 100% rename from video-app/src/main/java/org/thoughtcrime/video/app/ui/theme/Color.kt rename to video/app/src/main/java/org/thoughtcrime/video/app/ui/theme/Color.kt diff --git a/video-app/src/main/java/org/thoughtcrime/video/app/ui/theme/Theme.kt b/video/app/src/main/java/org/thoughtcrime/video/app/ui/theme/Theme.kt similarity index 100% rename from video-app/src/main/java/org/thoughtcrime/video/app/ui/theme/Theme.kt rename to video/app/src/main/java/org/thoughtcrime/video/app/ui/theme/Theme.kt diff --git a/video-app/src/main/java/org/thoughtcrime/video/app/ui/theme/Type.kt b/video/app/src/main/java/org/thoughtcrime/video/app/ui/theme/Type.kt similarity index 100% rename from video-app/src/main/java/org/thoughtcrime/video/app/ui/theme/Type.kt rename to video/app/src/main/java/org/thoughtcrime/video/app/ui/theme/Type.kt diff --git a/video-app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/video/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from video-app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to video/app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/video-app/src/main/res/drawable/ic_launcher_background.xml b/video/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from video-app/src/main/res/drawable/ic_launcher_background.xml rename to video/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/video-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/video/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from video-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to video/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/video-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/video/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from video-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to video/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/video-app/src/main/res/mipmap-hdpi/ic_launcher.webp b/video/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from video-app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to video/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/video-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/video/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from video-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to video/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/video-app/src/main/res/mipmap-mdpi/ic_launcher.webp b/video/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from video-app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to video/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/video-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/video/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from video-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to video/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/video-app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/video/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from video-app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to video/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/video-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/video/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from video-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to video/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/video-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/video/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from video-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to video/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/video-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/video/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from video-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to video/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/video-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/video/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from video-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to video/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/video-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/video/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from video-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to video/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/video-app/src/main/res/values/colors.xml b/video/app/src/main/res/values/colors.xml similarity index 100% rename from video-app/src/main/res/values/colors.xml rename to video/app/src/main/res/values/colors.xml diff --git a/video-app/src/main/res/values/strings.xml b/video/app/src/main/res/values/strings.xml similarity index 100% rename from video-app/src/main/res/values/strings.xml rename to video/app/src/main/res/values/strings.xml diff --git a/video-app/src/main/res/values/themes.xml b/video/app/src/main/res/values/themes.xml similarity index 100% rename from video-app/src/main/res/values/themes.xml rename to video/app/src/main/res/values/themes.xml diff --git a/video-app/src/test/java/org/thoughtcrime/video/app/ExampleUnitTest.kt b/video/app/src/test/java/org/thoughtcrime/video/app/ExampleUnitTest.kt similarity index 100% rename from video-app/src/test/java/org/thoughtcrime/video/app/ExampleUnitTest.kt rename to video/app/src/test/java/org/thoughtcrime/video/app/ExampleUnitTest.kt diff --git a/video/build.gradle b/video/lib/build.gradle similarity index 100% rename from video/build.gradle rename to video/lib/build.gradle diff --git a/video/src/main/AndroidManifest.xml b/video/lib/src/main/AndroidManifest.xml similarity index 100% rename from video/src/main/AndroidManifest.xml rename to video/lib/src/main/AndroidManifest.xml diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AndroidMuxer.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AndroidMuxer.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AndroidMuxer.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AndroidMuxer.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/EncodingException.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/EncodingException.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/EncodingException.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/EncodingException.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/InputSurface.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/InputSurface.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/InputSurface.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/InputSurface.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/Muxer.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/Muxer.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/Muxer.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/Muxer.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/OutputSurface.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/OutputSurface.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/OutputSurface.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/OutputSurface.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/Preconditions.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/Preconditions.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/Preconditions.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/Preconditions.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TextureRender.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TextureRender.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TextureRender.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TextureRender.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TranscodingException.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TranscodingException.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TranscodingException.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TranscodingException.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AacTrack.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AacTrack.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AacTrack.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AacTrack.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AvcTrack.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AvcTrack.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AvcTrack.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AvcTrack.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/H264Utils.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/H264Utils.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/H264Utils.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/H264Utils.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/HevcTrack.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/HevcTrack.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/HevcTrack.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/HevcTrack.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Mp4Writer.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Mp4Writer.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Mp4Writer.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Mp4Writer.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/MuxingException.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/MuxingException.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/MuxingException.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/MuxingException.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/StreamingMuxer.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/StreamingMuxer.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/StreamingMuxer.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/StreamingMuxer.java diff --git a/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Utils.java b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Utils.java similarity index 100% rename from video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Utils.java rename to video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Utils.java