Skip to content

Commit

Permalink
Merge branch 'release/2.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
@benoitletondor
benoitletondor committed Jan 29, 2020
2 parents ef6652d + 6f2a6fe commit 3972ca3
Show file tree
Hide file tree
Showing 229 changed files with 2,892 additions and 4,270 deletions.
158 changes: 97 additions & 61 deletions Android/EasyBudget/app/app.iml
View file

Large diffs are not rendered by default.

50 changes: 30 additions & 20 deletions Android/EasyBudget/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019 Benoit LETONDOR
* Copyright 2020 Benoit LETONDOR
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,7 @@ buildscript {
}

dependencies {
classpath 'io.fabric.tools:gradle:1.29.0'
classpath 'io.fabric.tools:gradle:1.31.2'
}
}

Expand All @@ -47,8 +47,8 @@ android {
applicationId "com.benoitletondor.easybudgetapp"
minSdkVersion 21
targetSdkVersion 29
versionCode 66
versionName "2.0.13"
versionCode 70
versionName "2.1.3"
vectorDrawables.useSupportLibrary = true
}
buildTypes {
Expand Down Expand Up @@ -77,42 +77,52 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "1.8"
}
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
implementation 'androidx.core:core-ktx:1.0.2'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.core:core-ktx:1.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.preference:preference-ktx:1.1.0-beta01'
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0-beta01'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0-beta01'
implementation 'androidx.preference:preference-ktx:1.1.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
implementation 'androidx.work:work-runtime-ktx:2.3.0'
implementation 'androidx.work:work-gcm:2.3.0'

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'

implementation 'com.google.firebase:firebase-core:17.0.0'
implementation 'com.google.firebase:firebase-messaging:19.0.1'
implementation 'com.google.firebase:firebase-core:17.2.2'
implementation 'com.google.firebase:firebase-messaging:20.1.0'
implementation 'com.google.firebase:firebase-storage:19.1.0'
implementation 'com.firebaseui:firebase-ui-auth:6.2.0'

implementation 'com.android.billingclient:billing:2.0.1'
implementation 'com.android.billingclient:billing:2.1.0'

implementation project(':caldroid')
implementation 'com.getbase:floatingactionbutton:1.10.1'
implementation 'me.relex:circleindicator:2.1.0@aar'
implementation 'me.relex:circleindicator:2.1.4@aar'
implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') { transitive = true }
implementation 'com.batch.android:batch-sdk:1.14.1'
implementation 'com.batch.android:batch-sdk:1.14.4'

implementation 'org.koin:koin-core:2.0.1'
implementation 'org.koin:koin-android:2.0.1'
implementation 'org.koin:koin-android-viewmodel:2.0.1'
implementation 'org.koin:koin-java:2.0.1'

kapt "androidx.room:room-compiler:2.1.0"
implementation "androidx.room:room-runtime:2.1.0"
implementation "androidx.room:room-ktx:2.1.0"
kapt "androidx.room:room-compiler:2.2.3"
implementation "androidx.room:room-runtime:2.2.3"
implementation "androidx.room:room-ktx:2.2.3"

implementation 'net.lingala.zip4j:zip4j:2.2.8'
}

apply plugin: 'com.google.gms.google-services'
98 changes: 42 additions & 56 deletions Android/EasyBudget/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2019 Benoit LETONDOR
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.benoitletondor.easybudgetapp">

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest package="com.benoitletondor.easybudgetapp"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="com.android.vending.BILLING"/>

<!-- Push -->
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="com.android.vending.BILLING" /> <!-- Push -->
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.VIBRATE" />

<application
android:name=".EasyBudget"
android:allowBackup="true"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:label="@string/app_name"
android:theme="@style/AppTheme"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="false"
android:theme="@style/LoadingTheme"
tools:ignore="UnusedAttribute">

<!-- Disable advertising ID and SSAID for GA & FCM -->
<meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
<meta-data android:name="firebase_analytics_adid_collection_enabled" android:value="false" />
<meta-data android:name="google_analytics_ssaid_collection_enabled" android:value="false" />

<!-- Fabric.io -->
<meta-data
android:name="google_analytics_adid_collection_enabled"
android:value="false" />
<meta-data
android:name="firebase_analytics_adid_collection_enabled"
android:value="false" />
<meta-data
android:name="google_analytics_ssaid_collection_enabled"
android:value="false" /> <!-- Fabric.io -->
<meta-data
android:name="io.fabric.ApiKey"
android:value="4f073b46e47c18a4636da5e93128e7c7d9f1600c"/>
android:value="4f073b46e47c18a4636da5e93128e7c7d9f1600c" />

<activity
android:name=".view.main.MainActivity"
Expand All @@ -53,17 +40,17 @@
android:launchMode="singleTask"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="easybudget"/>
<data android:scheme="easybudget" />
</intent-filter>

<meta-data
Expand All @@ -72,56 +59,55 @@
</activity>
<activity
android:name=".view.report.base.MonthlyReportBaseActivity"
android:label="@string/title_activity_monthly_report"
android:configChanges="locale|keyboardHidden|orientation|screenSize"
android:label="@string/title_activity_monthly_report"
android:screenOrientation="portrait" />
<activity
android:name=".view.expenseedit.ExpenseEditActivity"
android:configChanges="locale|keyboardHidden|orientation|screenSize"
android:label="@string/title_activity_add_expense"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".view.recurringexpenseadd.RecurringExpenseAddActivity"
android:configChanges="locale|keyboardHidden|orientation|screenSize"
android:label="@string/title_activity_recurring_expense_add"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".view.settings.SettingsActivity"
android:configChanges="locale|keyboardHidden|orientation|screenSize"
android:label="@string/title_activity_settings"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".view.welcome.WelcomeActivity"
android:configChanges="locale|keyboardHidden|orientation|screenSize"
android:label="@string/title_activity_welcome"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".view.premium.PremiumActivity"
android:configChanges="locale|keyboardHidden|orientation|screenSize"
android:label="@string/title_activity_premium"
android:screenOrientation="portrait">
</activity>
android:screenOrientation="portrait" />
<activity
android:name=".view.settings.backup.BackupSettingsActivity"
android:label="@string/backup_settings_activity_title" />

<service
android:name=".notif.DarkThemeNotif"
android:name=".notif.BackupNotif"
android:exported="false" />

<!-- Push -->
<service
android:name=".push.PushService"
tools:ignore="ExportedService">
<intent-filter
android:priority="999">
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
<intent-filter android:priority="999">
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service>

<!-- Notif services -->
</service> <!-- Notif services -->
<receiver android:name=".notif.AppUpdateBroadcastReceiver">
<intent-filter>
<action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
</intent-filter>
</receiver>
</application>

</manifest>
</manifest>
22 changes: 21 additions & 1 deletion Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/BuildVersion.kt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019 Benoit LETONDOR
* Copyright 2020 Benoit LETONDOR
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -97,4 +97,24 @@ object BuildVersion {
* 13/07/2019
*/
const val VERSION_2_0_13 = 66
/**
* Cloud backup beta
* 11/01/2020
*/
const val VERSION_2_1_0 = 67
/**
* Cloud backup beta 2
* 11/01/2020
*/
const val VERSION_2_1_1 = 68
/**
* Cloud backup beta 3
* 11/01/2020
*/
const val VERSION_2_1_2 = 69
/**
* Cloud backup release
* 23/01/2020
*/
const val VERSION_2_1_3 = 70
}
Loading

0 comments on commit 3972ca3

Please sign in to comment.