Skip to content

Commit

Permalink
Merge pull request #194 from mhss1/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
mhss1 committed May 6, 2024
2 parents 3d9f531 + 39925b6 commit 6ee25ae
Show file tree
Hide file tree
Showing 86 changed files with 1,967 additions and 843 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
/.idea/inspectionProfiles/Project_Default.xml
/.idea/deploymentTargetDropDown.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
/.idea/deploymentTargetSelector.xml
/app/release
5 changes: 2 additions & 3 deletions .idea/gradle.xml

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

38 changes: 0 additions & 38 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

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

10 changes: 10 additions & 0 deletions .idea/migrations.xml

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

5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

# My Brain


### Open-source, All-in-one productivity app for Tasks, Notes, Calendar, Diary and Bookmarks.

<div align="left">
Expand All @@ -21,12 +20,12 @@
[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
alt="Get it on F-Droid"
height="80">](https://f-droid.org/packages/com.mhss.app.mybrain)
[<img src="https://camo.githubusercontent.com/70bffd8873ab81e1bb0bccc44e488c3a989e3bd5/68747470733a2f2f692e6962622e636f2f71306d6463345a2f6765742d69742d6f6e2d6769746875622e706e67"
[<img src="https://github.com/mhss1/MyBrain/assets/58703865/94cbf557-b1a9-4339-b6b4-def21dde3c11"
alt="Get it on GitHub"
height="80">](https://github.com/mhss1/MyBrain/releases/latest)

## Features
- Private with no data collection and no internet permission at all.
- Private with no data collection at all.
- Create tasks with priority, sub-tasks, description and due date and reminders.
- Create Notes that supports markdown which enables you to use Headers, lists, links etc..
- Record your mood daily and view your mood summary with beautiful graphs.
Expand Down
55 changes: 31 additions & 24 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
id("org.jetbrains.kotlin.android")
id ("com.google.dagger.hilt.android")
id ("com.google.devtools.ksp")
kotlin("plugin.serialization")
}

android {
Expand All @@ -14,8 +15,8 @@ android {
applicationId = "com.mhss.app.mybrain"
minSdk = 26
targetSdk = 34
versionCode = 7
versionName = "1.0.6"
versionCode = 8
versionName = "1.0.7"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
Expand All @@ -34,6 +35,7 @@ android {
debug {
isMinifyEnabled = false
applicationIdSuffix = ".debug"
isDebuggable = false
resValue("string", "app_name", "MyBrain Debug")
}
}
Expand All @@ -50,7 +52,7 @@ android {
buildConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.2"
kotlinCompilerExtensionVersion = "1.5.12"
}
packaging {
resources {
Expand All @@ -63,60 +65,59 @@ android {
}

dependencies {
val roomVersion = "2.6.0"
val coroutinesVersion = "1.7.3"
val lifecycleVersion = "2.6.2"
val workVersion = "2.8.1"
implementation(platform("androidx.compose:compose-bom:2023.09.01"))

implementation("androidx.core:core-ktx:1.12.0")
val roomVersion = "2.6.1"
val coroutinesVersion = "1.8.0"
val lifecycleVersion = "2.7.0"
val workVersion = "2.9.0"
implementation(platform("androidx.compose:compose-bom:2024.05.00"))

implementation("androidx.appcompat:appcompat:1.6.1")
implementation("androidx.core:core-ktx:1.13.1")
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.material:material")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
implementation("androidx.activity:activity-compose:1.8.0")
implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion")
implementation("androidx.activity:activity-compose:1.9.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")

// Compose navigation
implementation("androidx.navigation:navigation-compose:2.7.4")
implementation("androidx.hilt:hilt-navigation-compose:1.0.0")
implementation("androidx.navigation:navigation-compose:2.7.7")
implementation("androidx.hilt:hilt-navigation-compose:1.2.0")

// Room
implementation("androidx.room:room-runtime:$roomVersion")
ksp("androidx.room:room-compiler:$roomVersion")
implementation("androidx.room:room-ktx:$roomVersion")

//Dagger - Hilt
implementation("com.google.dagger:hilt-android:2.48")
ksp("com.google.dagger:hilt-android-compiler:2.48")
ksp("androidx.hilt:hilt-compiler:1.0.0")
implementation("androidx.hilt:hilt-work:1.0.0")
implementation("com.google.dagger:hilt-android:2.49")
ksp("com.google.dagger:hilt-android-compiler:2.49")
ksp("androidx.hilt:hilt-compiler:1.2.0")
implementation("androidx.hilt:hilt-work:1.2.0")

// Coroutines
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")

// Gson
implementation("com.google.code.gson:gson:2.10")

// Preferences DataStore
implementation("androidx.datastore:datastore-preferences:1.0.0")
implementation("androidx.datastore:datastore-preferences:1.1.1")

// Accompanist libraries
implementation("com.google.accompanist:accompanist-flowlayout:0.23.1")
implementation("com.google.accompanist:accompanist-systemuicontroller:0.23.1")
implementation("com.google.accompanist:accompanist-permissions:0.23.1")

// Compose MarkDown
implementation("com.github.jeziellago:compose-markdown:0.3.4")
implementation("com.github.jeziellago:compose-markdown:0.5.0")

// Compose Glance (Widgets)
implementation("androidx.glance:glance-appwidget:1.0.0")
implementation("androidx.glance:glance-material:1.0.0")
implementation("androidx.glance:glance-appwidget:1.1.0-beta02")
implementation("androidx.glance:glance-material:1.1.0-beta02")

//Moshi
implementation("com.squareup.moshi:moshi-kotlin:1.14.0")
Expand All @@ -129,6 +130,12 @@ dependencies {

// DocumentFile
implementation("androidx.documentfile:documentfile:1.0.1")

// Biometric
implementation("androidx.biometric:biometric:1.2.0-alpha05")

// Kotlinx serialization
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
}

ksp {
Expand Down

0 comments on commit 6ee25ae

Please sign in to comment.