diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 221fba013da278b8112f3ecebe310d811610714a..cbe985fe9b78ea18ad3ba20fde10c2eb1960519f 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -50,11 +50,7 @@ android:layout_marginTop="4dp" android:gravity="center" android:text="@string/empty_media_storage_info" - android:textSize="13sp" - app:layout_constraintBottom_toBottomOf="@id/ivProfile" - app:layout_constraintEnd_toEndOf="@id/ivEditProfile" - app:layout_constraintStart_toStartOf="@id/ivEditProfile" - app:layout_constraintTop_toBottomOf="@id/ivEditProfile" /> + android:textSize="13sp" /> <View android:layout_width="match_parent" diff --git a/auth-fdroid-release.aar b/auth-fdroid-release.aar new file mode 100644 index 0000000000000000000000000000000000000000..96db121a3e1cc1d5e703ff26fc91c08b8ac0eabc Binary files /dev/null and b/auth-fdroid-release.aar differ diff --git a/auth-gplay-release.aar b/auth-gplay-release.aar new file mode 100644 index 0000000000000000000000000000000000000000..02d710ebe5b74437380a85e44ec43259698eb4f8 Binary files /dev/null and b/auth-gplay-release.aar differ diff --git a/core-release.aar b/core-release.aar new file mode 100644 index 0000000000000000000000000000000000000000..fd04393c932a61349a1affea39838c6e13572a93 Binary files /dev/null and b/core-release.aar differ diff --git a/gallery-release.aar b/gallery-release.aar new file mode 100644 index 0000000000000000000000000000000000000000..61e6c3c0a9b0a2e7f5baf8d819af1b65201e48a8 Binary files /dev/null and b/gallery-release.aar differ diff --git a/modules_release.sh b/modules_release.sh index c4dccefbc16c5a9c56ef2a349bf3a59e15d401f8..94ddaed07f86de3af4e933e1c98efe10deffc0ae 100644 --- a/modules_release.sh +++ b/modules_release.sh @@ -44,9 +44,9 @@ awk '!/<packaging>aar<\/packaging>/' pom_gallery.xml > tmp && mv tmp pom_gallery awk '!/<packaging>aar<\/packaging>/' pom_auth_fdroid.xml > tmp && mv tmp pom_auth_fdroid.xml awk '!/<packaging>aar<\/packaging>/' pom_auth_gplay.xml > tmp && mv tmp pom_auth_gplay.xml -# Change dependencies visibility to compile in pom -awk '{gsub(/<scope>runtime<\/scope>/, "<scope>compile</scope>")}1' pom_core.xml > temp && mv temp pom_core.xml -awk '{gsub(/<scope>runtime<\/scope>/, "<scope>compile</scope>")}1' pom_gallery.xml > temp && mv temp pom_gallery.xml -awk '{gsub(/<scope>runtime<\/scope>/, "<scope>compile</scope>")}1' pom_auth_fdroid.xml > temp && mv temp pom_auth_fdroid.xml -awk '{gsub(/<scope>runtime<\/scope>/, "<scope>compile</scope>")}1' pom_auth_gplay.xml > temp && mv temp pom_auth_gplay.xml +## Change dependencies visibility to compile in pom +#awk '{gsub(/<scope>runtime<\/scope>/, "<scope>compile</scope>")}1' pom_core.xml > temp && mv temp pom_core.xml +#awk '{gsub(/<scope>runtime<\/scope>/, "<scope>compile</scope>")}1' pom_gallery.xml > temp && mv temp pom_gallery.xml +#awk '{gsub(/<scope>runtime<\/scope>/, "<scope>compile</scope>")}1' pom_auth_fdroid.xml > temp && mv temp pom_auth_fdroid.xml +#awk '{gsub(/<scope>runtime<\/scope>/, "<scope>compile</scope>")}1' pom_auth_gplay.xml > temp && mv temp pom_auth_gplay.xml diff --git a/pom_auth_fdroid.xml b/pom_auth_fdroid.xml new file mode 100644 index 0000000000000000000000000000000000000000..f9f8b70fb3ce12444927e939e0698c797b69703d --- /dev/null +++ b/pom_auth_fdroid.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <!-- This module was also published with a richer model, Gradle metadata, --> + <!-- which should be used instead. Do not delete the following line which --> + <!-- is to indicate to Gradle or any Gradle module metadata file consumer --> + <!-- that they should prefer consuming it instead. --> + <!-- do_not_remove: published-with-gradle-metadata --> + <modelVersion>4.0.0</modelVersion> + <groupId>org.futo.gitlab.circles</groupId> + <artifactId>auth_fdroid</artifactId> + <version>1.0.10</version> + <dependencies> + <dependency> + <groupId>androidx.databinding</groupId> + <artifactId>viewbinding</artifactId> + <version>8.3.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk8</artifactId> + <version>1.9.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.browser</groupId> + <artifactId>browser</artifactId> + <version>1.8.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.nulab-inc</groupId> + <artifactId>zxcvbn</artifactId> + <version>1.9.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.github.yuriy-budiyev</groupId> + <artifactId>code-scanner</artifactId> + <version>2.3.2</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.google.dagger</groupId> + <artifactId>hilt-android</artifactId> + <version>2.51.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>androidx.hilt</groupId> + <artifactId>hilt-work</artifactId> + <version>1.2.0</version> + <scope>runtime</scope> + </dependency> + </dependencies> +</project> diff --git a/pom_auth_gplay.xml b/pom_auth_gplay.xml new file mode 100644 index 0000000000000000000000000000000000000000..69717e376633be3e689750dafafe58c4edb07429 --- /dev/null +++ b/pom_auth_gplay.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <!-- This module was also published with a richer model, Gradle metadata, --> + <!-- which should be used instead. Do not delete the following line which --> + <!-- is to indicate to Gradle or any Gradle module metadata file consumer --> + <!-- that they should prefer consuming it instead. --> + <!-- do_not_remove: published-with-gradle-metadata --> + <modelVersion>4.0.0</modelVersion> + <groupId>org.futo.gitlab.circles</groupId> + <artifactId>auth_gplay</artifactId> + <version>1.0.10</version> + <dependencies> + <dependency> + <groupId>androidx.databinding</groupId> + <artifactId>viewbinding</artifactId> + <version>8.3.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk8</artifactId> + <version>1.9.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.android.billingclient</groupId> + <artifactId>billing-ktx</artifactId> + <version>6.2.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>androidx.credentials</groupId> + <artifactId>credentials</artifactId> + <version>1.3.0-alpha02</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>androidx.credentials</groupId> + <artifactId>credentials-play-services-auth</artifactId> + <version>1.3.0-alpha02</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>androidx.browser</groupId> + <artifactId>browser</artifactId> + <version>1.8.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.nulab-inc</groupId> + <artifactId>zxcvbn</artifactId> + <version>1.9.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.github.yuriy-budiyev</groupId> + <artifactId>code-scanner</artifactId> + <version>2.3.2</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.google.dagger</groupId> + <artifactId>hilt-android</artifactId> + <version>2.51.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>androidx.hilt</groupId> + <artifactId>hilt-work</artifactId> + <version>1.2.0</version> + <scope>runtime</scope> + </dependency> + </dependencies> +</project> diff --git a/pom_core.xml b/pom_core.xml new file mode 100644 index 0000000000000000000000000000000000000000..82282321bedacf006072d028a37feef218f80d01 --- /dev/null +++ b/pom_core.xml @@ -0,0 +1,208 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <!-- This module was also published with a richer model, Gradle metadata, --> + <!-- which should be used instead. Do not delete the following line which --> + <!-- is to indicate to Gradle or any Gradle module metadata file consumer --> + <!-- that they should prefer consuming it instead. --> + <!-- do_not_remove: published-with-gradle-metadata --> + <modelVersion>4.0.0</modelVersion> + <groupId>org.futo.gitlab.circles</groupId> + <artifactId>core</artifactId> + <version>1.0.10</version> + <dependencies> + <dependency> + <groupId>androidx.appcompat</groupId> + <artifactId>appcompat</artifactId> + <version>1.6.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.google.android.material</groupId> + <artifactId>material</artifactId> + <version>1.11.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.recyclerview</groupId> + <artifactId>recyclerview</artifactId> + <version>1.3.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.autofill</groupId> + <artifactId>autofill</artifactId> + <version>1.1.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.core</groupId> + <artifactId>core-ktx</artifactId> + <version>1.12.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.lifecycle</groupId> + <artifactId>lifecycle-livedata-ktx</artifactId> + <version>2.7.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.lifecycle</groupId> + <artifactId>lifecycle-viewmodel-ktx</artifactId> + <version>2.7.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.lifecycle</groupId> + <artifactId>lifecycle-process</artifactId> + <version>2.7.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.navigation</groupId> + <artifactId>navigation-fragment-ktx</artifactId> + <version>2.7.7</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.navigation</groupId> + <artifactId>navigation-ui-ktx</artifactId> + <version>2.7.7</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.github.kirich1409</groupId> + <artifactId>viewbindingpropertydelegate-noreflection</artifactId> + <version>1.5.9</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.futo.gitlab.circles</groupId> + <artifactId>matrix-android-sdk</artifactId> + <version>v1.6.10.32</version> + <type>aar</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.squareup.retrofit2</groupId> + <artifactId>retrofit</artifactId> + <version>2.11.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.squareup.retrofit2</groupId> + <artifactId>converter-gson</artifactId> + <version>2.11.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.10.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.work</groupId> + <artifactId>work-runtime-ktx</artifactId> + <version>2.9.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.github.bumptech.glide</groupId> + <artifactId>glide</artifactId> + <version>4.16.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.github.penfeizhou.android.animation</groupId> + <artifactId>glide-plugin</artifactId> + <version>3.0.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.google.zxing</groupId> + <artifactId>core</artifactId> + <version>3.5.3</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.noties.markwon</groupId> + <artifactId>core</artifactId> + <version>4.6.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.noties.markwon</groupId> + <artifactId>linkify</artifactId> + <version>4.6.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.noties.markwon</groupId> + <artifactId>ext-strikethrough</artifactId> + <version>4.6.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.noties.markwon</groupId> + <artifactId>ext-tasklist</artifactId> + <version>4.6.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.element.android</groupId> + <artifactId>wysiwyg</artifactId> + <version>2.36.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.media3</groupId> + <artifactId>media3-exoplayer</artifactId> + <version>1.3.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.media3</groupId> + <artifactId>media3-ui</artifactId> + <version>1.3.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>androidx.databinding</groupId> + <artifactId>viewbinding</artifactId> + <version>8.3.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk8</artifactId> + <version>1.9.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.google.dagger</groupId> + <artifactId>hilt-android</artifactId> + <version>2.51.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>jp.wasabeef</groupId> + <artifactId>glide-transformations</artifactId> + <version>4.3.0</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.github.WycliffeAssociates</groupId> + <artifactId>jdenticon-kotlin</artifactId> + <version>1.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.caverock</groupId> + <artifactId>androidsvg-aar</artifactId> + <version>1.4</version> + <scope>runtime</scope> + </dependency> + </dependencies> +</project> diff --git a/pom_gallery.xml b/pom_gallery.xml new file mode 100644 index 0000000000000000000000000000000000000000..30d5210c7dc985e69da2ff3e3ae2fcf373d8607c --- /dev/null +++ b/pom_gallery.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <!-- This module was also published with a richer model, Gradle metadata, --> + <!-- which should be used instead. Do not delete the following line which --> + <!-- is to indicate to Gradle or any Gradle module metadata file consumer --> + <!-- that they should prefer consuming it instead. --> + <!-- do_not_remove: published-with-gradle-metadata --> + <modelVersion>4.0.0</modelVersion> + <groupId>org.futo.gitlab.circles</groupId> + <artifactId>gallery</artifactId> + <version>1.0.10</version> + <dependencies> + <dependency> + <groupId>androidx.databinding</groupId> + <artifactId>viewbinding</artifactId> + <version>8.3.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk8</artifactId> + <version>1.9.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.jsibbold</groupId> + <artifactId>zoomage</artifactId> + <version>1.3.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.google.dagger</groupId> + <artifactId>hilt-android</artifactId> + <version>2.51.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>androidx.hilt</groupId> + <artifactId>hilt-work</artifactId> + <version>1.2.0</version> + <scope>runtime</scope> + </dependency> + </dependencies> +</project>