update UnPeekLiveData and SharedViewModel write

Author: KunMinX

jetpack_java/src/main/java/com/kunminx/jetpack_java/sample_05_navigation/ui/NavigationEditorFragment.java

@@ -62,7 +62,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        mSharedViewModel.location.observe(getViewLifecycleOwner(), s -> {
+        mSharedViewModel.getLocation().observeInFragment(this, s -> {
             mEditorViewModel.location.set(s);
         });
     }
@@ -92,7 +92,7 @@ public boolean onMenuItemClick(MenuItem item) {
                 moment.setLocation(mEditorViewModel.location.get());
                 moment.setImgUrl(mEditorViewModel.imgUrl.get());
                 moment.setContent(mEditorViewModel.content.get());
-                mSharedViewModel.moment.setValue(moment);
+                mSharedViewModel.requestAddMoment(moment);
                 nav().navigateUp();
             }
             return true;

jetpack_java/src/main/java/com/kunminx/jetpack_java/sample_05_navigation/ui/NavigationListFragment.java

@@ -71,7 +71,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
             mListViewModel.list.setValue(moments);
         });
 
-        mSharedViewModel.moment.observe(getViewLifecycleOwner(), moment -> {
+        mSharedViewModel.getMoment().observeInFragment(this, moment -> {
             mListViewModel.list.getValue().add(0, moment);
             mListViewModel.list.setValue(mListViewModel.list.getValue());
         });
@@ -85,7 +85,7 @@ public void fabClick() {
         }
 
         public void back() {
-            mSharedViewModel.closeActivity.setValue(true);
+            mSharedViewModel.requestCloseActivity();
         }
     }
 }

jetpack_java/src/main/java/com/kunminx/jetpack_java/sample_05_navigation/ui/NavigationLocationFragment.java

@@ -54,7 +54,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 
         DataBindingLocationAdapter adapter = new DataBindingLocationAdapter(mActivity.getApplicationContext());
         adapter.setOnItemClickListener(((item, position) -> {
-            mSharedViewModel.location.setValue(item.getLocationName());
+            mSharedViewModel.requestAddLocation(item.getLocationName());
             nav().navigateUp();
         }));
         binding.setAdapter(adapter);

jetpack_java/src/main/java/com/kunminx/jetpack_java/sample_05_navigation/ui/NavigationMainActivity.java

@@ -36,7 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         DataBindingUtil.setContentView(this, R.layout.activity_main_navigation);
 
-        mSharedViewModel.closeActivity.observe(this, aBoolean -> {
+        mSharedViewModel.getCloseActivity().observeInActivity(this, aBoolean -> {
             finish();
         });
     }

jetpack_java/src/main/java/com/kunminx/jetpack_java/sample_05_navigation/ui/callback/SharedViewModel.java

@@ -4,6 +4,7 @@
 
 import androidx.lifecycle.ViewModel;
 
+import com.kunminx.architecture.ui.callback.ProtectedUnPeekLiveData;
 import com.kunminx.architecture.ui.callback.UnPeekLiveData;
 import com.kunminx.jetpack_java.common_data.bean.Moment;
 
@@ -22,8 +23,34 @@
  */
 public class SharedViewModel extends ViewModel {
 
-    public final UnPeekLiveData<String> location = new UnPeekLiveData<>();
-    public final UnPeekLiveData<Moment> moment = new UnPeekLiveData<>();
-    public final UnPeekLiveData<Boolean> closeActivity = new UnPeekLiveData<>();
+    private UnPeekLiveData<String> location;
+    private UnPeekLiveData<Moment> moment;
+    private UnPeekLiveData<Boolean> closeActivity;
 
+    public ProtectedUnPeekLiveData<String> getLocation() {
+        if (location == null) location = new UnPeekLiveData<>();
+        return location;
+    }
+
+    public ProtectedUnPeekLiveData<Moment> getMoment() {
+        if (moment == null) moment = new UnPeekLiveData<>();
+        return moment;
+    }
+
+    public ProtectedUnPeekLiveData<Boolean> getCloseActivity() {
+        if (closeActivity == null) closeActivity = new UnPeekLiveData<>();
+        return closeActivity;
+    }
+
+    public void requestAddMoment(Moment moment) {
+        this.moment.setValue(moment);
+    }
+
+    public void requestCloseActivity() {
+        this.closeActivity.setValue(true);
+    }
+
+    public void requestAddLocation(String locationName) {
+        this.location.setValue(locationName);
+    }
 }

jetpack_kotlin/src/main/java/com/flywith24/jetpack_kotlin/common_data/bean/Moment.kt

@@ -11,10 +11,10 @@ import kotlinx.android.parcel.Parcelize
  */
 @Parcelize
 data class Moment(
-        val uuid: String,
+        var uuid: String,
         val content: String?,
         val location: String?,
         val imgUrl: String,
-        val username: String,
-        val userAvatar: String
+        var username: String,
+        var userAvatar: String
 ) : Parcelable

jetpack_kotlin/src/main/java/com/flywith24/jetpack_kotlin/sample_04_databinding/ui/DataBindingLocationActivity.kt

@@ -8,6 +8,7 @@ import androidx.databinding.DataBindingUtil
 
 import com.flywith24.jetpack_kotlin.R
 import com.flywith24.jetpack_kotlin.common_data.Configs
+import com.flywith24.jetpack_kotlin.common_data.bean.Moment
 import com.flywith24.jetpack_kotlin.databinding.KotlinActivityLocationDatabindingBinding
 import com.flywith24.jetpack_kotlin.sample_02_livedata.domain.LiveDataLocationManager
 import com.flywith24.jetpack_kotlin.sample_04_databinding.ui.adapter.DataBindingLocationAdapter

version_config/src/main/java/com/flywith24/version_config/dependencies/ThirdParty.kt

@@ -20,7 +20,7 @@ object ThirdParty {
     }
 
     object Archi {
-        const val unPeekLiveData = "com.kunminx.archi:unpeek-livedata:3.2.3-beta10"
+        const val unPeekLiveData = "com.kunminx.archi:unpeek-livedata:4.4.1-beta1"
     }
 
     const val roundedImageView = "com.makeramen:roundedimageview:2.3.0"