Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2: Voice notes #42

Merged
merged 46 commits into from
Feb 1, 2024
Merged

#2: Voice notes #42

merged 46 commits into from
Feb 1, 2024

Conversation

shubertm
Copy link
Member

@shubertm shubertm commented Dec 19, 2023

shubertm and others added 30 commits October 1, 2023 20:08
# Conflicts:
#	app/build.gradle
#	app/src/main/java/space/taran/arkmemo/App.kt
#	app/src/main/java/space/taran/arkmemo/data/repositories/TextNotesRepository.kt
#	app/src/main/java/space/taran/arkmemo/data/viewmodels/EditTextNotesViewModel.kt
#	app/src/main/java/space/taran/arkmemo/files/FilePicker.kt
#	app/src/main/java/space/taran/arkmemo/preferences/MemoPreferences.kt
#	app/src/main/java/space/taran/arkmemo/ui/activities/MainActivity.kt
#	app/src/main/java/space/taran/arkmemo/ui/fragments/EditTextNotesFragment.kt
#	app/src/main/java/space/taran/arkmemo/ui/fragments/SettingsFragment.kt
# Conflicts:
#	app/src/main/java/space/taran/arkmemo/data/repositories/TextNotesRepo.kt
#	app/src/main/java/space/taran/arkmemo/preferences/MemoPreferences.kt
#	app/src/main/java/space/taran/arkmemo/ui/activities/MainActivity.kt
#	app/src/main/java/space/taran/arkmemo/ui/viewmodels/NotesViewModel.kt
# Conflicts:
#	app/src/main/java/dev/arkbuilders/arkmemo/data/repositories/TextNotesRepo.kt
#	app/src/main/java/dev/arkbuilders/arkmemo/data/repositories/TextNotesRepoImpl.kt
#	app/src/main/java/dev/arkbuilders/arkmemo/ui/fragments/EditTextNotesFragment.kt
#	app/src/main/java/dev/arkbuilders/arkmemo/ui/viewmodels/NotesViewModel.kt
#	app/src/main/res/values/strings.xml
@tuancoltech
Copy link
Collaborator

@ShubertMunthali Could you please rebase the branch with main to remove the merge conflicts first?

@shubertm
Copy link
Member Author

@ShubertMunthali Could you please rebase the branch with main to remove the merge conflicts first?

Alright @tuancoltech

@kirillt
Copy link
Member

kirillt commented Dec 20, 2023

Basic recording works. There are some issues, but I'm sure we can polish the app from this point.

@kirillt kirillt self-assigned this Jan 11, 2024
Copy link
Member

@kirillt kirillt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It works good, only need to catch up with main.

@shubertm
Copy link
Member Author

It works good, only need to catch up with main.

Alright, we will catch up soon

@shubertm shubertm merged commit 6157a35 into main Feb 1, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants