#11: Re-implementation of version tracking #13

shubertm · 2023-02-27T09:43:23Z

Re-implementation of #12

kirillt · 2023-09-07T11:05:55Z

Catch up with latest arklib-android
Catch up with latest ark-filepicker

kirillt · 2023-09-13T16:00:58Z

I'm getting this crash right now:

Caused by: kotlin.UninitializedPropertyAccessException: lateinit property instance has not been initialized
	at space.taran.arkfilepicker.folders.FoldersRepo$Companion.getInstance(FoldersRepo.kt:249)
	at space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerViewModel.<init>(ArkFilePickerViewModel.kt:46)
	at space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerViewModelFactory.create(ArkFilePickerViewModel.kt:150)
	at androidx.lifecycle.ViewModelProvider$Factory.create(ViewModelProvider.kt:83)
	at androidx.lifecycle.ViewModelProvider.get(ViewModelProvider.kt:187)
	at androidx.lifecycle.ViewModelProvider.get(ViewModelProvider.kt:153)
	at androidx.lifecycle.ViewModelLazy.getValue(ViewModelLazy.kt:53)
	at androidx.lifecycle.ViewModelLazy.getValue(ViewModelLazy.kt:35)
	at space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment.getViewModel(ArkFilePickerFragment.kt:74)
	at space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment.getPages(ArkFilePickerFragment.kt:287)
	at space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment.initUI(ArkFilePickerFragment.kt:126)
	at space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment.onViewCreated(ArkFilePickerFragment.kt:89)
	at androidx.fragment.app.Fragment.performViewCreated(Fragment.java:3128)
	at androidx.fragment.app.FragmentStateManager.createView(FragmentStateManager.java:552)
	at androidx.fragment.app.FragmentStateManager.moveToExpectedState(FragmentStateManager.java:261)
	at androidx.fragment.app.FragmentManager.executeOpsTogether(FragmentManager.java:1899)
	at androidx.fragment.app.FragmentManager.removeRedundantOperationsAndExecute(FragmentManager.java:1823)
	at androidx.fragment.app.FragmentManager.execPendingActions(FragmentManager.java:1760)
	at androidx.fragment.app.FragmentController.execPendingActions(FragmentController.java:495)
	at androidx.fragment.app.FragmentActivity.onResume(FragmentActivity.java:312)
	at android.app.Instrumentation.callActivityOnResume(Instrumentation.java:1488)
	at android.app.Activity.performResume(Activity.java:8197)
	at android.app.ActivityThread.performResumeActivity(ActivityThread.java:4814)
	... 13 more

shubertm · 2023-09-20T06:28:28Z

I'm getting this crash right now:

Caused by: kotlin.UninitializedPropertyAccessException: lateinit property instance has not been initialized
	at space.taran.arkfilepicker.folders.FoldersRepo$Companion.getInstance(FoldersRepo.kt:249)
	at space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerViewModel.<init>(ArkFilePickerViewModel.kt:46)
	at space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerViewModelFactory.create(ArkFilePickerViewModel.kt:150)
	at androidx.lifecycle.ViewModelProvider$Factory.create(ViewModelProvider.kt:83)
	at androidx.lifecycle.ViewModelProvider.get(ViewModelProvider.kt:187)
	at androidx.lifecycle.ViewModelProvider.get(ViewModelProvider.kt:153)
	at androidx.lifecycle.ViewModelLazy.getValue(ViewModelLazy.kt:53)
	at androidx.lifecycle.ViewModelLazy.getValue(ViewModelLazy.kt:35)
	at space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment.getViewModel(ArkFilePickerFragment.kt:74)
	at space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment.getPages(ArkFilePickerFragment.kt:287)
	at space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment.initUI(ArkFilePickerFragment.kt:126)
	at space.taran.arkfilepicker.presentation.filepicker.ArkFilePickerFragment.onViewCreated(ArkFilePickerFragment.kt:89)
	at androidx.fragment.app.Fragment.performViewCreated(Fragment.java:3128)
	at androidx.fragment.app.FragmentStateManager.createView(FragmentStateManager.java:552)
	at androidx.fragment.app.FragmentStateManager.moveToExpectedState(FragmentStateManager.java:261)
	at androidx.fragment.app.FragmentManager.executeOpsTogether(FragmentManager.java:1899)
	at androidx.fragment.app.FragmentManager.removeRedundantOperationsAndExecute(FragmentManager.java:1823)
	at androidx.fragment.app.FragmentManager.execPendingActions(FragmentManager.java:1760)
	at androidx.fragment.app.FragmentController.execPendingActions(FragmentController.java:495)
	at androidx.fragment.app.FragmentActivity.onResume(FragmentActivity.java:312)
	at android.app.Instrumentation.callActivityOnResume(Instrumentation.java:1488)
	at android.app.Activity.performResume(Activity.java:8197)
	at android.app.ActivityThread.performResumeActivity(ActivityThread.java:4814)
	... 13 more

This crash happens because filepicker changed, we have to initialise FoldersRepo during app creation.

…ARK-Memo into version-tracking-2

kirillt · 2023-10-06T02:25:32Z

We should merge #18 first.

kirillt · 2023-11-18T08:12:26Z

@ShubertMunthali we need to resolve conflicts before merging.

# Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/dev/arkbuilders/arkmemo/App.kt # app/src/main/java/dev/arkbuilders/arkmemo/files/FilePicker.kt # app/src/main/java/dev/arkbuilders/arkmemo/files/parsers/JsonParser.kt # app/src/main/java/dev/arkbuilders/arkmemo/models/TextNote.kt # app/src/main/java/dev/arkbuilders/arkmemo/ui/activities/MainActivity.kt # app/src/main/java/dev/arkbuilders/arkmemo/ui/adapters/TextNotesListAdapter.kt # app/src/main/java/dev/arkbuilders/arkmemo/ui/dialogs/NoteDeleteDialogFragment.kt # app/src/main/java/dev/arkbuilders/arkmemo/ui/fragments/EditTextNotesFragment.kt # app/src/main/java/dev/arkbuilders/arkmemo/ui/fragments/NotesFragment.kt # app/src/main/java/dev/arkbuilders/arkmemo/ui/fragments/SettingsFragment.kt # app/src/main/java/dev/arkbuilders/arkmemo/ui/fragments/TextNoteVersionsFragment.kt # app/src/main/java/dev/arkbuilders/arkmemo/ui/views/PathPreference.kt # app/src/main/java/dev/arkbuilders/arkmemo/utils/ArkFiles.kt # app/src/main/java/dev/arkbuilders/arkmemo/utils/Config.kt # app/src/main/java/space/taran/arkmemo/data/repo/notes/text/TextNotesRepo.kt # app/src/main/java/space/taran/arkmemo/data/viewmodels/EditTextNotesViewModel.kt # app/src/main/java/space/taran/arkmemo/data/viewmodels/TextNotesViewModel.kt # app/src/main/java/space/taran/arkmemo/preferences/MemoPreferences.kt # app/src/main/res/values/strings.xml # app/src/test/java/dev/arkbuilders/arkmemo/VersionStorageTest.kt # build.gradle # gradle/wrapper/gradle-wrapper.properties # settings.gradle

kirillt · 2023-12-14T16:04:43Z

@ShubertMunthali sorry, we need update it again

shubertm · 2023-12-17T12:39:36Z

@ShubertMunthali we need to resolve conflicts before merging.

Cool, I will resolve them

shubertm · 2023-12-17T12:40:12Z

@ShubertMunthali sorry, we need update it again

Yes, I will update it

kirillt · 2023-12-21T08:29:26Z

It works! I've checked both text notes and graphic notes. Versions are displayed correctly and forking functions correctly, too. This is really cool.

We have new reusable storage primitives in arklib-android, let's use them to reduce amount of code. See FileStorage arklib-android.

I think, it's possible to implement VersionStorage similarly to ScoreStorage. Scores storage is id-to-integer mapping, and versions storage is id-to-id. The code will be very similar to the scores storage.

Also, we should find another icon for forking feature, I'll ask our UX team.

shubertm · 2023-12-23T16:32:30Z

You are right @kirillt
I think it will be efficient to just extract VeraionStorage to arklib-android now
I see that we may need it in Retouch soon

kirillt · 2023-12-24T02:33:57Z

@ShubertMunthali it's OK to keep VersionStorage in this repo for the moment. More important is to derive it from ready-made base classes.

But yes, we'll move it eventually to arklib-android.

shubertm · 2023-12-24T06:18:49Z

Alright @kirillt, so let's make important storage API from arklib-android public, I think we can make it internal after all storages are moved there

kirillt · 2023-12-25T08:12:42Z

@ShubertMunthali yes, if our ready-made primitives can't be used to implement custom storages — this should be fixed. Because it would be great if 3rd party developers could write their own storages for their apps.

It's possible to compile arklib-android and inject the local version into the app. It would be easier for experimentation.

Re-implementing version tracking

ab47493

shubertm requested review from mdrlzy and kirillt February 27, 2023 09:43

shubertm had a problem deploying to Development February 27, 2023 09:47 — with GitHub Actions Failure

Minor fix

6905458

shubertm temporarily deployed to Development February 27, 2023 13:15 — with GitHub Actions Inactive

Hide and show buttons

126d717

shubertm temporarily deployed to Development February 28, 2023 15:38 — with GitHub Actions Inactive

kirillt changed the title ~~Re-implementation of version tracking~~ #11: Re-implementation of version tracking May 27, 2023

README stub

9775e6a

kirillt temporarily deployed to Development September 13, 2023 15:30 — with GitHub Actions Inactive

kirillt mentioned this pull request Sep 14, 2023

Bounty #8 for Shubert #17

Closed

shubertm added 2 commits September 21, 2023 22:21

Forking note

b7f3a0d

Merge branch 'version-tracking-2' of https://github.com/ARK-Builders/…

15c90df

…ARK-Memo into version-tracking-2

shubertm temporarily deployed to Development September 21, 2023 20:26 — with GitHub Actions Inactive

Fix note saving

8886ba2

shubertm temporarily deployed to Development September 27, 2023 11:26 — with GitHub Actions Inactive

Fix note creation

26c811e

shubertm temporarily deployed to Development September 29, 2023 13:16 — with GitHub Actions Inactive

kirillt assigned shubertm Oct 21, 2023

Update ark dependencies

8dc86c0

shubertm temporarily deployed to Development November 17, 2023 13:59 — with GitHub Actions Inactive

shubertm requested review from hieuwu and tuancoltech November 17, 2023 15:59

Resolve conflicts + some refactors

838b64c

shubertm temporarily deployed to Development November 30, 2023 18:11 — with GitHub Actions Inactive

shubertm added 2 commits December 18, 2023 23:48

Merge main + refactors

69f56ae

Some fixes

0e7b176

shubertm temporarily deployed to Development December 20, 2023 20:20 — with GitHub Actions Inactive

Adopt ARK storage for versions

42f9cf3

shubertm had a problem deploying to Development December 28, 2023 10:53 — with GitHub Actions Failure

shubertm mentioned this pull request Jan 11, 2024

Dedicated title/description input fields #46

Merged

kirillt assigned tuancoltech Apr 3, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#11: Re-implementation of version tracking #13

#11: Re-implementation of version tracking #13

shubertm commented Feb 27, 2023 •

edited by kirillt

Loading

kirillt commented Sep 7, 2023 •

edited

Loading

kirillt commented Sep 13, 2023

shubertm commented Sep 20, 2023

kirillt commented Oct 6, 2023

kirillt commented Nov 18, 2023

kirillt commented Dec 14, 2023

shubertm commented Dec 17, 2023

shubertm commented Dec 17, 2023

kirillt commented Dec 21, 2023

shubertm commented Dec 23, 2023

kirillt commented Dec 24, 2023

shubertm commented Dec 24, 2023

kirillt commented Dec 25, 2023

#11: Re-implementation of version tracking #13

Are you sure you want to change the base?

#11: Re-implementation of version tracking #13

Conversation

shubertm commented Feb 27, 2023 • edited by kirillt Loading

kirillt commented Sep 7, 2023 • edited Loading

kirillt commented Sep 13, 2023

shubertm commented Sep 20, 2023

kirillt commented Oct 6, 2023

kirillt commented Nov 18, 2023

kirillt commented Dec 14, 2023

shubertm commented Dec 17, 2023

shubertm commented Dec 17, 2023

kirillt commented Dec 21, 2023

shubertm commented Dec 23, 2023

kirillt commented Dec 24, 2023

shubertm commented Dec 24, 2023

kirillt commented Dec 25, 2023

shubertm commented Feb 27, 2023 •

edited by kirillt

Loading

kirillt commented Sep 7, 2023 •

edited

Loading