last modification

team0se7en · Oct 26, 2019 · 866cf96 · 866cf96
1 parent 13c3359
commit 866cf96
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/app/src/main/java/com/team7/socialblind/ui/MainActivity.kt b/app/src/main/java/com/team7/socialblind/ui/MainActivity.kt
@@ -80,7 +80,9 @@ class MainActivity : AppCompatActivity() {
         }
         binding.sendButton.setOnClickListener {
             val text = binding.messageEdittext.text.toString()
-            viewModel.sendMessage(text)
+            if(!text.isEmpty()){
+                viewModel.sendMessage(text)
+            }
         }
         binding.changeSubject.setOnClickListener {
             viewModel.changeSubject()

diff --git a/app/src/main/java/com/team7/socialblind/ui/SplashActivity.kt b/app/src/main/java/com/team7/socialblind/ui/SplashActivity.kt
@@ -8,5 +8,7 @@ class SplashActivity:AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         startActivity(Intent(this , MainActivity::class.java ))
+        finish()
+
     }
 }
diff --git a/app/src/main/java/com/team7/socialblind/util/DataBindingAdapters.kt b/app/src/main/java/com/team7/socialblind/util/DataBindingAdapters.kt
@@ -16,6 +16,8 @@ import com.google.android.flexbox.FlexWrap
 import com.google.android.flexbox.FlexboxLayoutManager
 import com.google.android.material.button.MaterialButton
 import com.squareup.picasso.Picasso
+import com.team7.socialblind.R
+import de.hdodenhof.circleimageview.CircleImageView
 import timber.log.Timber
 
 
@@ -42,6 +44,11 @@ fun setLayoutmanager(recyclerView: RecyclerView, layoutManager: LayoutManagersTy
     }
 
 }
+@BindingAdapter("imageUrl")
+fun setImageUrl(imageView: CircleImageView , imageUrl:String?){
+    if(imageUrl==null) imageView.setImageResource(R.drawable.anounym)
+    else Picasso.get().load(imageUrl).into(imageView)
+}
 
 @BindingAdapter("epoxyController")
 fun setRecyclerData(recyclerView: EpoxyRecyclerView, controller: EpoxyController) {