Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .idea/copyright/IONOS_HiDrive_Next.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 18 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ buildscript {
classpath "org.jacoco:org.jacoco.core:$jacoco_version"
classpath "org.jacoco:org.jacoco.report:$jacoco_version"
classpath "org.jacoco:org.jacoco.agent:$jacoco_version"
classpath 'com.google.gms:google-services:4.4.2'
classpath "com.google.firebase:firebase-crashlytics-gradle:3.0.2"
}
}

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

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

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

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

Expand Down Expand Up @@ -163,8 +169,11 @@ android {
}

gplay {
applicationId 'com.nextcloud.client'
applicationId "com.ionos.hidrivenext"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be part of brander already

dimension "default"
versionCode 3
isDefault = true
resConfigs "en", "de", "es", "fr", "nl"
}

huawei {
Expand Down Expand Up @@ -322,6 +331,7 @@ dependencies {
gplayImplementation project(':appscan')
huaweiImplementation project(':appscan')
qaImplementation project(':appscan')
implementation project(':scanbot')

spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.13.0'
spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.6.9'
Expand Down Expand Up @@ -370,6 +380,9 @@ dependencies {
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
}

implementation reactivex_rxjava2
implementation reactivex_rxandroid2

// dependencies for local unit tests
testImplementation 'junit:junit:4.13.2'
testImplementation "org.mockito:mockito-core:$mockitoVersion"
Expand Down Expand Up @@ -430,6 +443,10 @@ dependencies {

// splash screen dependency ref: https://developer.android.com/develop/ui/views/launch/splash-screen/migrate
implementation 'androidx.core:core-splashscreen:1.0.1'

implementation(platform("com.google.firebase:firebase-bom:33.7.0"))
implementation "com.google.firebase:firebase-analytics"
implementation "com.google.firebase:firebase-crashlytics"
}

configurations.configureEach {
Expand Down
8 changes: 4 additions & 4 deletions app/src/gplay/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<uses-permission
android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
tools:node="remove"
tools:node="merge"
tools:ignore="ScopedStorage" />

<uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
Expand All @@ -30,13 +30,13 @@

<meta-data
android:name="firebase_analytics_collection_deactivated"
android:value="true" />
tools:node="remove" />
<meta-data
android:name="google_analytics_adid_collection_enabled"
android:value="false" />
tools:node="remove" />
<meta-data
android:name="google_analytics_ssaid_collection_enabled"
android:value="false" />
tools:node="remove" />

<activity
android:name=".authentication.ModifiedAuthenticatorActivity"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"project_info": {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The entire file will be replaced via brander, so you can revert this change

"project_number": "",
"project_id": ""
"project_id": "",
"storage_bucket": ""
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "",
"android_client_info": {
"package_name": "com.nextcloud.client"
"package_name": "com.ionos.hidrivenext"
}
},
"oauth_client": [],
Expand All @@ -18,18 +19,11 @@
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 1,
"other_platform_oauth_client": []
},
"ads_service": {
"status": 1
}
}
}
],
"configuration_version": "1"
}
}
Binary file added app/src/gplay/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions app/src/gplay/java/com/nextcloud/client/di/VariantModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
*
* SPDX-FileCopyrightText: 2023 Álvaro Brey <[email protected]>
* SPDX-FileCopyrightText: 2023 Nextcloud GmbH
* SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
* SPDX-FileCopyrightText: 2025 STRATO GmbH.
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
package com.nextcloud.client.di

import com.ionos.scanbot.availability.Availability
import com.ionos.scanbot.di.qualifiers.Scanbot
import com.ionos.scanbot.di.qualifiers.ScanbotLicense
import com.nextcloud.appscan.ScanPageContract
import com.nextcloud.client.documentscan.AppScanOptionalFeature
import dagger.Module
Expand All @@ -17,9 +21,13 @@ import dagger.Reusable
internal class VariantModule {
@Provides
@Reusable
fun scanOptionalFeature(): AppScanOptionalFeature {
fun scanOptionalFeature(
@Scanbot featureAvailability: Availability,
@ScanbotLicense licenseAvailability: Availability
): AppScanOptionalFeature {
return object : AppScanOptionalFeature() {
override fun getScanContract() = ScanPageContract()
override val isAvailable: Boolean = featureAvailability.available() && licenseAvailability.available()
}
}
}
29 changes: 29 additions & 0 deletions app/src/gplay/release/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"project_info": {
"project_number": "",
"project_id": "",
"storage_bucket": ""
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "",
"android_client_info": {
"package_name": "com.ionos.hidrivenext"
}
},
"oauth_client": [],
"api_key": [
{
"current_key": ""
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": []
}
}
}
],
"configuration_version": "1"
}
16 changes: 16 additions & 0 deletions app/src/gplay/res/animator/progress_bar_login_indeterminate.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ IONOS HiDrive Next - Android Client
~
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
~ SPDX-License-Identifier: GPL-2.0
-->

<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="2500"
android:interpolator="@android:anim/linear_interpolator"
android:propertyName="rotation"
android:repeatCount="-1"
android:valueFrom="0"
android:valueTo="720"
android:valueType="floatType" />
11 changes: 11 additions & 0 deletions app/src/gplay/res/color-night/drawer_item_shape_color.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ IONOS HiDrive Next - Android Client
~
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
~ SPDX-License-Identifier: GPL-2.0
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/ionos_drawer_item_background_checked" android:state_checked="true"/>
<item android:color="@color/ionos_drawer_item_background" />
</selector>
11 changes: 11 additions & 0 deletions app/src/gplay/res/color/drawer_item_shape_color.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ IONOS HiDrive Next - Android Client
~
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
~ SPDX-License-Identifier: GPL-2.0
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/ionos_drawer_item_background_checked" android:state_checked="true"/>
<item android:color="@color/ionos_drawer_item_background" />
</selector>
14 changes: 14 additions & 0 deletions app/src/gplay/res/color/filled_button_bg_color.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>

<!--
~ IONOS HiDrive Next - Android Client
~
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
~ SPDX-License-Identifier: GPL-2.0
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:color="@color/ionos_default_pressed_button_bg_color"/>
<item android:state_enabled="false" android:color="@color/ionos_default_disabled_button_bg_color"/>
<item android:color="@color/ionos_default_button_bg_color"/>
</selector>
14 changes: 14 additions & 0 deletions app/src/gplay/res/color/filled_button_text_color.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>

<!--
~ IONOS HiDrive Next - Android Client
~
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
~ SPDX-License-Identifier: GPL-2.0
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:color="@color/ionos_filled_button_pressed_text_color"/>
<item android:state_enabled="false" android:color="@color/ionos_filled_button_disabled_text_color"/>
<item android:color="@color/ionos_filled_button_default_text_color"/>
</selector>
14 changes: 14 additions & 0 deletions app/src/gplay/res/color/outlined_button_bg_color.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>

<!--
~ IONOS HiDrive Next - Android Client
~
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
~ SPDX-License-Identifier: GPL-2.0
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:color="@color/ionos_outlined_pressed_button_bg_color"/>
<item android:state_enabled="false" android:color="@color/ionos_outlined_disabled_button_bg_color"/>
<item android:color="@color/ionos_outlined_default_button_bg_color"/>
</selector>
14 changes: 14 additions & 0 deletions app/src/gplay/res/color/outlined_button_stroke_color.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>

<!--
~ IONOS HiDrive Next - Android Client
~
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
~ SPDX-License-Identifier: GPL-2.0
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:color="@color/ionos_outlined_pressed_button_stroke_color"/>
<item android:state_enabled="false" android:color="@color/ionos_outlined_disabled_button_stroke_color"/>
<item android:color="@color/ionos_outlined_default_button_stroke_color"/>
</selector>
14 changes: 14 additions & 0 deletions app/src/gplay/res/color/outlined_button_text_color.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>

<!--
~ IONOS HiDrive Next - Android Client
~
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
~ SPDX-License-Identifier: GPL-2.0
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:color="@color/ionos_outlined_button_pressed_text_color"/>
<item android:state_enabled="false" android:color="@color/ionos_outlined_button_disabled_text_color"/>
<item android:color="@color/ionos_outlined_button_default_text_color"/>
</selector>
14 changes: 14 additions & 0 deletions app/src/gplay/res/color/text_button_text_color.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>

<!--
~ IONOS HiDrive Next - Android Client
~
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
~ SPDX-License-Identifier: GPL-2.0
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:color="@color/ionos_text_button_pressed_text_color"/>
<item android:state_enabled="false" android:color="@color/ionos_text_button_disabled_text_color"/>
<item android:color="@color/ionos_text_button_default_text_color"/>
</selector>
18 changes: 18 additions & 0 deletions app/src/gplay/res/drawable-night/favorite.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!--
~ IONOS HiDrive Next - Android Client
~
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
~ SPDX-License-Identifier: GPL-2.0
-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:fillColor="#FFAA00"
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"
android:strokeWidth="1"
android:strokeColor="#ffffff" />
</vector>
Loading
Loading