Skip to content
Draft
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ plugins {
id 'kotlin-parcelize'
id 'com.google.gms.google-services'
id 'com.google.firebase.crashlytics'
id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.21'
}

android {
Expand Down Expand Up @@ -72,9 +73,14 @@ android {
jvmTarget = JavaVersion.VERSION_17.toString()
}
buildFeatures{
compose true
buildConfig true
viewBinding true
}

composeOptions {
kotlinCompilerExtensionVersion = "1.5.1"
}
}


Expand Down Expand Up @@ -110,4 +116,20 @@ dependencies {
implementation platform('com.google.firebase:firebase-bom:33.3.0')
implementation "com.google.firebase:firebase-crashlytics"
implementation "com.google.firebase:firebase-analytics"
def compose_version = "1.3.0"
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
implementation 'androidx.activity:activity-compose:1.3.1'
implementation 'com.jakewharton.timber:timber:5.0.1'

implementation 'com.godaddy.android.colorpicker:compose-color-picker:0.7.0'
implementation "androidx.navigation:navigation-compose:2.5.2"
implementation 'io.github.hokofly:hoko-blur:1.5.3'

implementation "com.github.bumptech.glide:glide:4.16.0"
kapt "com.github.bumptech.glide:compiler:4.16.0"
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0"

}
2 changes: 2 additions & 0 deletions app/src/main/java/dev/arkbuilders/arkmemo/App.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.app.Application
import dagger.hilt.android.HiltAndroidApp
import dev.arkbuilders.arklib.initArkLib
import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
import dev.arkbuilders.arkmemo.di.DIManager
import dev.arkbuilders.arkmemo.preferences.MemoPreferences
import javax.inject.Inject

Expand All @@ -17,6 +18,7 @@ class App: Application() {
super.onCreate()
System.loadLibrary("arklib")
initArkLib()
DIManager.init(this)
FoldersRepo.init(this)
}
}
22 changes: 22 additions & 0 deletions app/src/main/java/dev/arkbuilders/arkmemo/di/AppComponent.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package dev.arkbuilders.arkmemo.di

import android.app.Application
import android.content.Context
import dagger.BindsInstance
import dagger.Component
import dev.arkbuilders.arkmemo.ui.views.presentation.edit.EditViewModelFactory
import javax.inject.Singleton

@Singleton
@Component
interface AppComponent {
fun editVMFactory(): EditViewModelFactory.Factory
fun app(): Application
@Component.Factory
interface Factory {
fun create(
@BindsInstance application: Application,
@BindsInstance context: Context
): AppComponent
}
}
12 changes: 12 additions & 0 deletions app/src/main/java/dev/arkbuilders/arkmemo/di/DIManager.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package dev.arkbuilders.arkmemo.di

import android.app.Application

object DIManager {
lateinit var component: AppComponent
private set

fun init(app: Application) {
component = DaggerAppComponent.factory().create(app, app.applicationContext)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ data class GraphicNote(
val svg: SVG? = null,
@IgnoredOnParcel
override var resource: Resource? = null,
override var pendingForDelete: Boolean = false
override var pendingForDelete: Boolean = false,
val drawPath : String = "/storage/emulated/0/Documents/.ark/user/properties/3841-96509498.svg"
) : Note, Parcelable
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class GraphicNotesRepo @Inject constructor(
title = userNoteProperties.title,
description = userNoteProperties.description,
svg = svg,
resource = resource
resource = resource,
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ abstract class BaseEditNoteFragment: BaseFragment() {
}
}

if (this is EditGraphicNotesFragment) {
binding.toolbar.tvRightActionText.visible()
binding.toolbar.ivRightActionIcon.gone()
} else {
binding.toolbar.tvRightActionText.gone()
binding.toolbar.ivRightActionIcon.visible()
}
// if (this is EditGraphicNotesFragment) {
// binding.toolbar.tvRightActionText.visible()
// binding.toolbar.ivRightActionIcon.gone()
// } else {
// binding.toolbar.tvRightActionText.gone()
// binding.toolbar.ivRightActionIcon.visible()
// }

if (getCurrentNote().resource == null) {
binding.tvLastModified.gone()
Expand Down
Loading