diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9e05d19..a777f49 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -44,7 +44,7 @@ android {
dependencies {
val room_version = "2.5.0"
- implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
+ implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
// Jetpack
implementation("androidx.core:core-ktx:1.9.0")
implementation("androidx.appcompat:appcompat:1.6.1")
diff --git a/app/libs/shareapi.aar b/app/libs/shareapi.aar
deleted file mode 100644
index 21186cd..0000000
Binary files a/app/libs/shareapi.aar and /dev/null differ
diff --git a/app/src/main/java/com/haodustudio/DailyNotes/view/activities/FreeMakeNote.kt b/app/src/main/java/com/haodustudio/DailyNotes/view/activities/FreeMakeNote.kt
index 97eafe2..0efa0f0 100644
--- a/app/src/main/java/com/haodustudio/DailyNotes/view/activities/FreeMakeNote.kt
+++ b/app/src/main/java/com/haodustudio/DailyNotes/view/activities/FreeMakeNote.kt
@@ -37,10 +37,6 @@ import com.haodustudio.DailyNotes.view.customView.freeLayout.objects.BitmapObjec
import com.haodustudio.DailyNotes.view.customView.freeLayout.objects.TextObject
import com.haodustudio.DailyNotes.viewModel.viewModels.GlobalViewModel
import com.permissionx.guolindev.PermissionX
-import com.xtc.shareapi.share.communication.SendMessageToXTC
-import com.xtc.shareapi.share.manager.ShareMessageManager
-import com.xtc.shareapi.share.shareobject.XTCImageObject
-import com.xtc.shareapi.share.shareobject.XTCShareMessage
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
@@ -106,7 +102,6 @@ class FreeMakeNote : DialogActivity(noShot = true, canDis = true) {
private fun handleIntentExtras() {
noteId = intent.getLongExtra("noteId", -1L)
isEditMode = intent.getBooleanExtra("editMode", false)
- val shareMode = intent.getBooleanExtra("share", false)
setTheme(if (isEditMode) R.style.DialogActivityTheme else R.style.DialogActivityTheme2)
@@ -115,15 +110,6 @@ class FreeMakeNote : DialogActivity(noShot = true, canDis = true) {
finish()
return
}
-
- if (shareMode) {
- appViewModel.getNoteFromIdLiveData(noteId).observe(this) {
- if (it != null && this.note == null) {
- this.note = it
- loadNoteContent(it, shareAfterLoad = true)
- }
- }
- }
}
private fun setupUI() {
@@ -144,16 +130,13 @@ class FreeMakeNote : DialogActivity(noShot = true, canDis = true) {
}
}
- private fun loadNoteContent(noteToLoad: Note, shareAfterLoad: Boolean = false) {
+ private fun loadNoteContent(noteToLoad: Note) {
try {
loadFreeObjects(noteToLoad.data["noteFolder"])
binding.freeLayout.addPaper(noteToLoad.data["pageSize"]?.toInt() ?: 0)
currentBackgroundColorId = noteToLoad.data["backgroundColor"]?.toInt() ?: 12
val colorRes = BaseApplication.idToTextColor[currentBackgroundColorId] ?: R.color.white
binding.backgroundColorRoot.setBackgroundColor(ContextCompat.getColor(this, colorRes))
- if (shareAfterLoad) {
- shareNoteAsImage()
- }
} catch (e: Exception) {
e.printStackTrace()
makeToast("加载失败")
@@ -402,21 +385,4 @@ class FreeMakeNote : DialogActivity(noShot = true, canDis = true) {
e.printStackTrace()
}
}
-
- private fun shareNoteAsImage() {
- binding.viewToShot.postDelayed({
- try {
- val shareImage = BitmapUtils.viewConversionBitmap(binding.viewToShot)
- val xtcImageObject = XTCImageObject().apply { setBitmap(shareImage) }
- val xtcShareMessage = XTCShareMessage().apply { shareObject = xtcImageObject }
- val request = SendMessageToXTC.Request().apply {
- message = xtcShareMessage
- flag = 1
- }
- ShareMessageManager(this).sendRequestToXTC(request, BaseApplication.APP_ID)
- } catch (e: Exception) {
- e.printStackTrace()
- }
- }, 800)
- }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/haodustudio/DailyNotes/view/activities/NoteOption.kt b/app/src/main/java/com/haodustudio/DailyNotes/view/activities/NoteOption.kt
index 2412068..7f739f6 100644
--- a/app/src/main/java/com/haodustudio/DailyNotes/view/activities/NoteOption.kt
+++ b/app/src/main/java/com/haodustudio/DailyNotes/view/activities/NoteOption.kt
@@ -67,22 +67,5 @@ class NoteOption : DialogActivity(noShot = true) {
startActivity(mIntent)
finish()
}
-
- binding.share.setOnClickListener {
- val mIntent: Intent = when (type) {
- NOTE_TYPE_V1 -> {
- Intent(this, NoteViewer::class.java)
- }
- else -> {
- Intent(this, FreeMakeNote::class.java).apply {
- addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
- }
- }
- }
- mIntent.putExtra("noteId", noteId)
- mIntent.putExtra("share", true)
- startActivity(mIntent)
- finish()
- }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/haodustudio/DailyNotes/view/activities/NoteViewer.kt b/app/src/main/java/com/haodustudio/DailyNotes/view/activities/NoteViewer.kt
index 57ae1c0..31ad8f9 100644
--- a/app/src/main/java/com/haodustudio/DailyNotes/view/activities/NoteViewer.kt
+++ b/app/src/main/java/com/haodustudio/DailyNotes/view/activities/NoteViewer.kt
@@ -25,10 +25,6 @@ import com.haodustudio.DailyNotes.view.adapters.FixLinearLayoutManager
import com.haodustudio.DailyNotes.view.adapters.ImageAdapter
import com.haodustudio.DailyNotes.view.adapters.RecordAdapter
import com.haodustudio.DailyNotes.viewModel.viewModels.GlobalViewModel
-import com.xtc.shareapi.share.communication.SendMessageToXTC
-import com.xtc.shareapi.share.manager.ShareMessageManager
-import com.xtc.shareapi.share.shareobject.XTCImageObject
-import com.xtc.shareapi.share.shareobject.XTCShareMessage
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
@@ -76,7 +72,6 @@ class NoteViewer : BaseActivity() {
binding.stickerLayout.setCanEdit(false)
val noteId = intent.getLongExtra("noteId", -1L)
- val shareMode = intent.getBooleanExtra("share", false)
isEditing = intent.getBooleanExtra("editMode", false)
if (noteId == -1L) {
@@ -87,13 +82,13 @@ class NoteViewer : BaseActivity() {
appViewModel.getNoteFromIdLiveData(noteId).observe(this) { updatedNote ->
noteData = updatedNote
- updateUI(updatedNote, shareMode)
+ updateUI(updatedNote)
}
setupListeners()
}
- private fun updateUI(note: Note, shareMode: Boolean) {
+ private fun updateUI(note: Note) {
try {
updateTittle(note.yy, note.mm, note.dd)
updateMood(note.mood)
@@ -103,12 +98,6 @@ class NoteViewer : BaseActivity() {
updateImage(note.data["imagePaths"]!!.toArray(), note.data["videoPaths"]!!.toArray())
updateRecord(note.data["recordPaths"]!!.toArray())
loadSticker(note)
-
- if (shareMode) {
- imageAdapter.setOnAllDoneListener {
- shotToShare()
- }
- }
} catch (e: Exception) {
makeToast("Failed to load note data")
e.printStackTrace()
@@ -260,22 +249,4 @@ class NoteViewer : BaseActivity() {
}
}
- private fun shotToShare() {
- lifecycleScope.launch {
- delay(800)
- try {
- val shareImage = BitmapUtils.viewConversionBitmap(binding.viewForShot)
- val xtcImageObject = XTCImageObject().apply { setBitmap(shareImage) }
- val xtcShareMessage = XTCShareMessage().apply { shareObject = xtcImageObject }
- val request = SendMessageToXTC.Request().apply {
- message = xtcShareMessage
- flag = 1
- }
- ShareMessageManager(this@NoteViewer).sendRequestToXTC(request, BaseApplication.APP_ID)
- } catch (e: Exception) {
- e.printStackTrace()
- withContext(Dispatchers.Main) { makeToast("分享失败") }
- }
- }
- }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/haodustudio/DailyNotes/view/activities/ViewImage.kt b/app/src/main/java/com/haodustudio/DailyNotes/view/activities/ViewImage.kt
index 4d8efba..014aa26 100644
--- a/app/src/main/java/com/haodustudio/DailyNotes/view/activities/ViewImage.kt
+++ b/app/src/main/java/com/haodustudio/DailyNotes/view/activities/ViewImage.kt
@@ -25,7 +25,6 @@ import com.haodustudio.DailyNotes.databinding.ActivityViewImageBinding
import com.haodustudio.DailyNotes.helper.makeToast
import com.haodustudio.DailyNotes.utils.BitmapUtils
import com.haodustudio.DailyNotes.view.activities.base.BaseActivity
-import com.xtc.shareapi.share.utils.BitmapUtil.getScreenWidth
class ViewImage : BaseActivity() {
diff --git a/app/src/main/res/drawable/ic_note_opt_share.png b/app/src/main/res/drawable/ic_note_opt_share.png
deleted file mode 100644
index 9c4b6bd..0000000
Binary files a/app/src/main/res/drawable/ic_note_opt_share.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_privacy_dialog_user.png b/app/src/main/res/drawable/ic_privacy_dialog_user.png
new file mode 100644
index 0000000..606770f
Binary files /dev/null and b/app/src/main/res/drawable/ic_privacy_dialog_user.png differ
diff --git a/app/src/main/res/drawable/ic_privacy_dialog_user.xml b/app/src/main/res/drawable/ic_privacy_dialog_user.xml
deleted file mode 100644
index f982304..0000000
--- a/app/src/main/res/drawable/ic_privacy_dialog_user.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_note_option.xml b/app/src/main/res/layout/activity_note_option.xml
index 0905447..dbc14c0 100644
--- a/app/src/main/res/layout/activity_note_option.xml
+++ b/app/src/main/res/layout/activity_note_option.xml
@@ -24,23 +24,6 @@
android:src="@drawable/ic_note_opt_edit" />
-
-
-
-
-
-
-