Merge branch 'fix_rename_path_not_found'

src/main/java/com/bomostory/sceneeditmodule/PdfMaker.kt

@@ -17,7 +17,7 @@ object PdfMaker {
             val coverWidth = width / 2
             val coverFile = project.coverFile
             emitter.onNext(progress++ / total)
-            val name = project.name ?: ""
+            val name = project.displayName ?: ""
             val author = project.author ?: ""
             val front = if (coverFile == null) {
                 CoverDrawer.drawFrontCover(width, height, name, author, project.frontCoverColor.getColor(context))
@@ -44,7 +44,7 @@ object PdfMaker {
             var progress = 0
             val width = 1920 / 2
             val height = 1080
-            val name = project.name ?: ""
+            val name = project.displayName ?: ""
             val author = project.author ?: ""
             val coverFile = project.coverFile
             emitter.onNext(progress++ / total)

src/main/java/com/bomostory/sceneeditmodule/basicdata/Project.kt

@@ -27,4 +27,10 @@ data class Project (
         var actorResource: ArrayList<ArrayList<String>>? = null,
     // TODO : Remove this
         var sceneResource: ArrayList<String>? = null
-)
+) {
+    var displayName: String? = null
+
+    init {
+        displayName = name
+    }
+}

src/main/java/com/bomostory/sceneeditmodule/screen/movie/MovieEditActivity.kt

@@ -407,6 +407,7 @@ class MovieEditActivity : AppCompatActivity(),
                             project.coverFile = coverFile
                         }
                         project.name = storyName
+                        project.displayName = storyName
                         project.author = author
                         project.frontCoverColor = frontCoverColor
                         project.backCoverColor = backCoverColor
@@ -425,7 +426,7 @@ class MovieEditActivity : AppCompatActivity(),
                 }
                 coverFile = project.coverFile
                 onCancel = View.OnClickListener { this.dismiss() }
-                storyName = project.name ?: ""
+                storyName = project.displayName ?: ""
                 author = project.author ?: ""
                 category = project.category
                 if (project.coverFile == null) {
@@ -446,7 +447,7 @@ class MovieEditActivity : AppCompatActivity(),
                 var isBooklet = false
                 when (exportPdfDialog.type) {
                     ExportPdfDialog.Type.Standard -> {
-                        val name = "standard_${viewModel.project?.name}_${System.currentTimeMillis()}.pdf"
+                        val name = "standard_${viewModel.project?.displayName}_${System.currentTimeMillis()}.pdf"
                         if (!Config.PDF_FOLDER.exists()) {
                             Config.PDF_FOLDER.mkdirs()
                         }
@@ -457,7 +458,7 @@ class MovieEditActivity : AppCompatActivity(),
                     }
                     ExportPdfDialog.Type.Booklet -> {
                         isBooklet = true
-                        val name = "booklet_${viewModel.project?.name}_${System.currentTimeMillis()}.pdf"
+                        val name = "booklet_${viewModel.project?.displayName}_${System.currentTimeMillis()}.pdf"
                         if (!Config.PDF_FOLDER.exists()) {
                             Config.PDF_FOLDER.mkdirs()
                         }
@@ -496,7 +497,7 @@ class MovieEditActivity : AppCompatActivity(),
             exportPdfDialog.onClickPrint = Runnable {
                 when (exportPdfDialog.type) {
                     ExportPdfDialog.Type.Standard -> {
-                        val name = "standard_${viewModel.project?.name}_${System.currentTimeMillis()}.pdf"
+                        val name = "standard_${viewModel.project?.displayName}_${System.currentTimeMillis()}.pdf"
                         if (!Config.PDF_FOLDER.exists()) {
                             Config.PDF_FOLDER.mkdirs()
                         }
@@ -506,7 +507,7 @@ class MovieEditActivity : AppCompatActivity(),
                         Pair(file, observable)
                     }
                     ExportPdfDialog.Type.Booklet -> {
-                        val name = "booklet_${viewModel.project?.name}_${System.currentTimeMillis()}.pdf"
+                        val name = "booklet_${viewModel.project?.displayName}_${System.currentTimeMillis()}.pdf"
                         if (!Config.PDF_FOLDER.exists()) {
                             Config.PDF_FOLDER.mkdirs()
                         }

src/main/java/com/bomostory/sceneeditmodule/screen/movie/MovieEditViewModel.kt

@@ -184,7 +184,7 @@ class MovieEditViewModel : ViewModel() {
         val id = context.getString(R.string.bomo_cloud_client_id)
         val secret = context.getString(R.string.bomo_cloud_client_secret)
         val author = project.author ?: ""
-        val name = project.name ?: ""
+        val name = project.displayName ?: ""
         val category = project.category.id
         val filePart = MultipartBody.Part.createFormData("file", file.name, RequestBody.create(MediaType.parse("video/*"), file))
         return BoMoCloud(id, secret).videoService
@@ -192,13 +192,7 @@ class MovieEditViewModel : ViewModel() {
     }
 
     fun saveProject(context: Context, project: Project, oldName: String): Completable {
-        var newProject = project
-        project.name?.let { projectName ->
-            if (projectName != oldName) {
-                newProject = com.bomostory.sceneeditmodule.utils.FileUtils.changeProjectName(oldName, projectName)
-            }
-        }
-        return FileUtils.saveProject(context, newProject, 1920, 1080)
+        return FileUtils.saveProject(context, project, 1920, 1080)
                 .andThen {
                     onProjectSavedListeners.forEach { it.run() }
                     it.onComplete()
@@ -266,5 +260,4 @@ class MovieEditViewModel : ViewModel() {
             }
         }
     }
-
 }

src/main/java/com/bomostory/sceneeditmodule/share/ExportPdfDialog.kt

@@ -77,7 +77,7 @@ class ExportPdfDialog : DialogFragment() {
     private fun createFrontCover(context: Context): Bitmap {
         val width = context.resources.getDimension(R.dimen.export_pdf_cover_width).toInt()
         val height = context.resources.getDimension(R.dimen.export_pdf_cover_height).toInt()
-        val name = project.name ?: ""
+        val name = project.displayName ?: ""
         val author = project.author ?: ""
         val color = project.frontCoverColor.getColor(context)
         project.coverFile.let { coverFile ->

src/main/java/com/bomostory/sceneeditmodule/share/ShareDialog.kt

@@ -48,7 +48,7 @@ class ShareDialog : DialogFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.dialog_share, container, false).apply {
             movieView_shareDialog_preview.scene = project.story?.scenes?.get(0)
-            tv_shareDialog_name.text = project.name
+            tv_shareDialog_name.text = project.displayName
             tv_shareDialog_author.text = project.author
             btn_shareDialog_editCover.setOnClickListener { onClickEditCover.run() }
             btn_shareDialog_exportPdf.setOnClickListener { onClickExportPdf.run() }