Skip to content

Commit e08e0da

Browse files
JayceLuongJayceLuong
committed
Merge branch 'main'
2 parents 93d4098 + 237b243 commit e08e0da

File tree

1,423 files changed

+6054
-2804
lines changed

Some content is hidden

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

1,423 files changed

+6054
-2804
lines changed

‎configs/dependencies.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ext {
2828
hiltVersion = "2.44.2"
2929

3030
// Nunchuk dep versions
31-
nativeSdkVersion = '1.1.60'
31+
nativeSdkVersion = '1.1.61'
3232

3333
// Matrix
3434
matrixSdkVersion = '1.5.30'
@@ -38,10 +38,10 @@ ext {
3838

3939
MAJOR_VERSION = 1
4040
MINOR_VERSION = 9
41-
PATCH_VERSION = 31
41+
PATCH_VERSION = 32
4242
TASK_LABEL = "UAT"
4343

44-
VERSION_CODE = 206
44+
VERSION_CODE = 207
4545

4646
androidConfig = [
4747
applicationId : "com.nunchuk.android",

‎nunchuk-app/src/main/java/com/nunchuk/android/app/Main.kt

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
package com.nunchuk.android.app
2+
3+
import java.io.File
4+
5+
object Main {
6+
@JvmStatic
7+
fun main(args: Array<String>) {
8+
File(System.getProperty("user.dir").orEmpty()).walkTopDown().asSequence()
9+
.filter {
10+
it.absolutePath.contains("generated").not()
11+
&& it.absolutePath.contains("tmp").not()
12+
}
13+
.filter { it.name != "Main.kt" }
14+
.filter { it.name.contains(".java") || it.name.contains(".kt") }.forEach {
15+
val content = it.readText()
16+
val removeHeader = if (content.contains("@file:OptIn")) {
17+
content.substring(content.indexOf("@file:OptIn"))
18+
} else {
19+
content.substring(content.indexOf("package"))
20+
}
21+
val newContent = """
22+
/**************************************************************************
23+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
24+
* Copyright (C) 2022, 2023 Nunchuk *
25+
* *
26+
* This program is free software; you can redistribute it and/or *
27+
* modify it under the terms of the GNU General Public License *
28+
* as published by the Free Software Foundation; either version 3 *
29+
* of the License, or (at your option) any later version. *
30+
* *
31+
* This program is distributed in the hope that it will be useful, *
32+
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
33+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
34+
* GNU General Public License for more details. *
35+
* *
36+
* You should have received a copy of the GNU General Public License *
37+
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
38+
* *
39+
**************************************************************************/
40+
""".trimIndent() + "\n\n" + removeHeader
41+
it.writeText(
42+
newContent
43+
)
44+
println(it.readText())
45+
}
46+
}
47+
}

‎nunchuk-app/src/main/java/com/nunchuk/android/app/NunchukApplication.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/di/AppCommonModule.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/di/AppModule.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/di/NunchukNavigatorModule.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/intro/GuestModeIntroActivity.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/intro/GuestModeMessageIntroActivity.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/intro/GuestModeViewModel.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/nav/NunchukNavigatorImpl.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/network/HeaderProviderImpl.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/provider/AppInfoProviderImpl.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/provider/PushNotificationIntentProviderImpl.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/splash/GuestModeEvent.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/splash/SplashActivity.kt

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *
@@ -22,8 +22,12 @@ package com.nunchuk.android.app.splash
2222
import android.os.Bundle
2323
import androidx.activity.viewModels
2424
import androidx.appcompat.app.AppCompatActivity
25-
import com.nunchuk.android.app.splash.SplashEvent.*
25+
import com.nunchuk.android.app.splash.SplashEvent.InitErrorEvent
26+
import com.nunchuk.android.app.splash.SplashEvent.NavActivateAccountEvent
27+
import com.nunchuk.android.app.splash.SplashEvent.NavHomeScreenEvent
28+
import com.nunchuk.android.app.splash.SplashEvent.NavSignInEvent
2629
import com.nunchuk.android.nav.NunchukNavigator
30+
import com.nunchuk.android.utils.NotificationUtils
2731
import com.nunchuk.android.widget.NCToastMessage
2832
import com.nunchuk.android.widget.util.setTransparentStatusBar
2933
import dagger.hilt.android.AndroidEntryPoint
@@ -52,7 +56,12 @@ internal class SplashActivity : AppCompatActivity() {
5256
when (event) {
5357
NavActivateAccountEvent -> navigator.openChangePasswordScreen(this)
5458
NavSignInEvent -> navigator.openSignInScreen(this, false)
55-
is NavHomeScreenEvent -> navigator.openMainScreen(this, loginHalfToken = event.loginHalfToken, deviceId = event.deviceId)
59+
is NavHomeScreenEvent -> {
60+
navigator.openMainScreen(this, loginHalfToken = event.loginHalfToken, deviceId = event.deviceId)
61+
if (NotificationUtils.areNotificationsEnabled(this).not()) {
62+
navigator.openTurnNotificationScreen(this)
63+
}
64+
}
5665
is InitErrorEvent -> NCToastMessage(this).showError(event.error)
5766
}
5867
overridePendingTransition(0, 0)

‎nunchuk-app/src/main/java/com/nunchuk/android/app/splash/SplashEvent.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/splash/SplashViewModel.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-app/src/main/java/com/nunchuk/android/app/wallet/QuickWalletActivity.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-arch/src/main/java/com/nunchuk/android/arch/args/Args.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-arch/src/main/java/com/nunchuk/android/arch/vm/NunchukViewModel.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-arch/src/main/java/com/nunchuk/android/arch/vm/SingleLiveEvent.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-auth/src/main/java/com/nunchuk/android/auth/api/AuthApi.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-auth/src/main/java/com/nunchuk/android/auth/api/AuthModels.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-auth/src/main/java/com/nunchuk/android/auth/api/Payloads.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-auth/src/main/java/com/nunchuk/android/auth/components/changepass/ChangePasswordActivity.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎nunchuk-auth/src/main/java/com/nunchuk/android/auth/components/changepass/ChangePasswordEvent.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**************************************************************************
2-
* This file is part of the Nunchuk software (https://nunchuk.io/) * *
3-
* Copyright (C) 2022 Nunchuk *
2+
* This file is part of the Nunchuk software (https://nunchuk.io/) *
3+
* Copyright (C) 2022, 2023 Nunchuk *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

0 commit comments

Comments
 (0)