Skip to content

Commit 9022a08

Browse files
AlexVisevenAlexViseven
committed
Release 1.1.0 test
1 parent a926450 commit 9022a08

File tree

873 files changed

+40559
-1044
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

873 files changed

+40559
-1044
lines changed

‎.idea/copyright/IONOS_HiDrive_Next.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/copyright/profiles_settings.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ buildscript {
2424
classpath "org.jacoco:org.jacoco.core:$jacoco_version"
2525
classpath "org.jacoco:org.jacoco.report:$jacoco_version"
2626
classpath "org.jacoco:org.jacoco.agent:$jacoco_version"
27+
classpath 'com.google.gms:google-services:4.4.2'
28+
classpath "com.google.firebase:firebase-crashlytics-gradle:3.0.2"
2729
}
2830
}
2931

@@ -43,6 +45,7 @@ apply plugin: 'pmd'
4345
apply from: "$rootProject.projectDir/jacoco.gradle"
4446
apply plugin: 'com.github.spotbugs'
4547
apply plugin: 'io.gitlab.arturbosch.detekt'
48+
apply plugin: 'com.google.firebase.crashlytics'
4649

4750
// needed to make renovate run without shot, as shot requires Android SDK
4851
// https://github.com/pedrovgs/Shot/issues/300
@@ -51,6 +54,9 @@ if (shotTest) {
5154
}
5255
apply plugin: 'com.google.devtools.ksp'
5356

57+
if (getGradle().getStartParameter().getTaskRequests().toString().contains("Gplay")){
58+
apply plugin: 'com.google.gms.google-services'
59+
}
5460

5561
println "Gradle uses Java ${Jvm.current()}"
5662

@@ -163,8 +169,11 @@ android {
163169
}
164170

165171
gplay {
166-
applicationId 'com.nextcloud.client'
172+
applicationId "com.ionos.hidrivenext"
167173
dimension "default"
174+
versionCode 15
175+
isDefault = true
176+
resConfigs "en", "de", "es", "fr", "nl", "it"
168177
}
169178

170179
huawei {
@@ -319,9 +328,9 @@ dependencies {
319328
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
320329

321330
// document scanner not available on FDroid (generic) due to OpenCV binaries
322-
gplayImplementation project(':appscan')
323331
huaweiImplementation project(':appscan')
324332
qaImplementation project(':appscan')
333+
implementation project(':scanbot')
325334

326335
spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.13.0'
327336
spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.6.9'
@@ -334,6 +343,10 @@ dependencies {
334343

335344
implementation 'org.conscrypt:conscrypt-android:2.5.3'
336345

346+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.10.2"
347+
348+
implementation "androidx.media3:media3-common:$androidxMediaVersion"
349+
implementation "androidx.media3:media3-session:$androidxMediaVersion"
337350
implementation "androidx.media3:media3-ui:$androidxMediaVersion"
338351
implementation "androidx.media3:media3-session:$androidxMediaVersion"
339352
implementation "androidx.media3:media3-exoplayer:$androidxMediaVersion"
@@ -370,6 +383,9 @@ dependencies {
370383
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
371384
}
372385

386+
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
387+
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
388+
373389
// dependencies for local unit tests
374390
testImplementation 'junit:junit:4.13.2'
375391
testImplementation "org.mockito:mockito-core:$mockitoVersion"
@@ -430,6 +446,10 @@ dependencies {
430446

431447
// splash screen dependency ref: https://developer.android.com/develop/ui/views/launch/splash-screen/migrate
432448
implementation 'androidx.core:core-splashscreen:1.0.1'
449+
450+
implementation(platform("com.google.firebase:firebase-bom:33.7.0"))
451+
implementation "com.google.firebase:firebase-analytics"
452+
implementation "com.google.firebase:firebase-crashlytics"
433453
}
434454

435455
configurations.configureEach {

‎app/src/gplay/AndroidManifest.xml‎

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
android:name="android.permission.REQUEST_INSTALL_PACKAGES"
1414
tools:node="remove"/>
1515

16+
<uses-permission
17+
android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
18+
tools:node="merge"
19+
tools:ignore="ScopedStorage" />
20+
1621
<uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
1722

1823
<application
@@ -25,13 +30,13 @@
2530

2631
<meta-data
2732
android:name="firebase_analytics_collection_deactivated"
28-
android:value="true" />
33+
tools:node="remove" />
2934
<meta-data
3035
android:name="google_analytics_adid_collection_enabled"
31-
android:value="false" />
36+
tools:node="remove" />
3237
<meta-data
3338
android:name="google_analytics_ssaid_collection_enabled"
34-
android:value="false" />
39+
tools:node="remove" />
3540

3641
<activity
3742
android:name=".authentication.ModifiedAuthenticatorActivity"
@@ -65,6 +70,46 @@
6570
</intent-filter>
6671
</service>
6772

73+
<meta-data
74+
android:name="firebase_analytics_collection_enabled"
75+
android:value="false"
76+
tools:node="merge" />
77+
78+
<receiver
79+
android:name="com.nextcloud.client.widget.DashboardWidgetProvider"
80+
android:enabled="false" />
81+
82+
<activity
83+
android:name=".ui.preview.PreviewImageActivity"
84+
android:theme="@style/Theme.ownCloud.PreviewImage"
85+
tools:replace="android:theme" />
86+
87+
<activity
88+
android:theme="@style/Theme.ownCloud.noActionBar.Login"
89+
android:name="com.ionos.authorization_method.AuthorizationMethodActivity"
90+
android:exported="false" />
91+
92+
<activity
93+
android:name="com.ionos.privacy.DataProtectionActivity"
94+
android:exported="false" />
95+
96+
<activity
97+
android:name="com.ionos.privacy.PrivacySettingsActivity"
98+
android:exported="false" />
99+
100+
<activity android:name=".ui.activity.ShareActivity"
101+
tools:remove="android:theme" />
102+
103+
<provider
104+
android:name="androidx.startup.InitializationProvider"
105+
android:authorities="${applicationId}.androidx-startup"
106+
android:exported="false"
107+
tools:node="merge">
108+
<meta-data
109+
android:name="com.ionos.startup.IonosInitializer"
110+
android:value="androidx.startup" />
111+
</provider>
112+
68113
</application>
69114

70115
</manifest>

‎app/src/gplay/ic_launcher-playstore.png‎

13.8 KB
Loading

‎app/src/gplay/java/com/nextcloud/client/di/VariantModule.kt‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33
*
44
* SPDX-FileCopyrightText: 2023 Álvaro Brey <[email protected]>
55
* SPDX-FileCopyrightText: 2023 Nextcloud GmbH
6-
* SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
6+
* SPDX-FileCopyrightText: 2025 STRATO GmbH.
7+
* SPDX-License-Identifier: AGPL-3.0-or-later
78
*/
89
package com.nextcloud.client.di
910

10-
import com.nextcloud.appscan.ScanPageContract
11+
import androidx.activity.result.contract.ActivityResultContract
12+
import com.ionos.scanbot.availability.Availability
13+
import com.ionos.scanbot.di.qualifiers.Scanbot
14+
import com.ionos.scanbot.di.qualifiers.ScanbotLicense
1115
import com.nextcloud.client.documentscan.AppScanOptionalFeature
1216
import dagger.Module
1317
import dagger.Provides
@@ -17,9 +21,15 @@ import dagger.Reusable
1721
internal class VariantModule {
1822
@Provides
1923
@Reusable
20-
fun scanOptionalFeature(): AppScanOptionalFeature {
24+
fun scanOptionalFeature(
25+
@Scanbot featureAvailability: Availability,
26+
@ScanbotLicense licenseAvailability: Availability
27+
): AppScanOptionalFeature {
2128
return object : AppScanOptionalFeature() {
22-
override fun getScanContract() = ScanPageContract()
29+
override fun getScanContract(): ActivityResultContract<Unit, String?> {
30+
throw UnsupportedOperationException("Document scan is not available")
31+
}
32+
override val isAvailable: Boolean = featureAvailability.available() && licenseAvailability.available()
2333
}
2434
}
2535
}

‎app/src/gplay/res/animator/progress_bar_login_indeterminate.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ IONOS HiDrive Next - Android Client
4+
~
5+
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
6+
~ SPDX-License-Identifier: GPL-2.0
7+
-->
8+
9+
<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
10+
android:duration="2500"
11+
android:interpolator="@android:anim/linear_interpolator"
12+
android:propertyName="rotation"
13+
android:repeatCount="-1"
14+
android:valueFrom="0"
15+
android:valueTo="720"
16+
android:valueType="floatType" />

‎app/src/gplay/res/color-night/drawer_item_shape_color.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ IONOS HiDrive Next - Android Client
4+
~
5+
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
6+
~ SPDX-License-Identifier: GPL-2.0
7+
-->
8+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
9+
<item android:color="@color/ionos_drawer_item_background_checked" android:state_checked="true"/>
10+
<item android:color="@color/ionos_drawer_item_background" />
11+
</selector>

‎app/src/gplay/res/color/drawer_item_shape_color.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ IONOS HiDrive Next - Android Client
4+
~
5+
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
6+
~ SPDX-License-Identifier: GPL-2.0
7+
-->
8+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
9+
<item android:color="@color/ionos_drawer_item_background_checked" android:state_checked="true"/>
10+
<item android:color="@color/ionos_drawer_item_background" />
11+
</selector>

‎app/src/gplay/res/drawable-night/favorite.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!--
2+
~ IONOS HiDrive Next - Android Client
3+
~
4+
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
5+
~ SPDX-License-Identifier: GPL-2.0
6+
-->
7+
8+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
9+
android:width="16dp"
10+
android:height="16dp"
11+
android:viewportWidth="16"
12+
android:viewportHeight="16">
13+
<path
14+
android:fillColor="#FFAA00"
15+
android:pathData="M8.417,0.774L8.418,0.776L10.366,4.91L10.48,5.151L10.743,5.191L15.096,5.853C15.097,5.853 15.097,5.853 15.097,5.853C15.265,5.879 15.416,6.003 15.475,6.189C15.534,6.374 15.485,6.576 15.355,6.708L15.355,6.709L12.198,9.93L12.02,10.111L12.061,10.361L12.81,14.913C12.81,14.913 12.81,14.913 12.81,14.913C12.841,15.107 12.762,15.299 12.612,15.411C12.472,15.516 12.287,15.53 12.128,15.444C12.128,15.444 12.128,15.444 12.127,15.443L8.242,13.304L8.001,13.171L7.76,13.304L3.874,15.443C3.874,15.444 3.874,15.444 3.873,15.444C3.718,15.528 3.531,15.515 3.387,15.409C3.242,15.302 3.16,15.109 3.192,14.913C3.192,14.913 3.192,14.913 3.192,14.913L3.937,10.361L3.978,10.111L3.801,9.93L0.644,6.709L0.643,6.708C0.516,6.579 0.465,6.375 0.524,6.186C0.581,6.005 0.731,5.88 0.902,5.853C0.902,5.853 0.902,5.853 0.902,5.853L5.252,5.191L5.516,5.151L5.629,4.91L7.577,0.777C7.577,0.777 7.577,0.777 7.577,0.777C7.661,0.6 7.826,0.5 7.998,0.5C8.172,0.5 8.337,0.602 8.417,0.774Z"
16+
android:strokeWidth="1"
17+
android:strokeColor="#ffffff" />
18+
</vector>

0 commit comments

Comments
 (0)