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

Fix/UI #6

Merged
merged 2 commits into from
Apr 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class ChatFragment : Fragment() {
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
mOutEditText = view.findViewById<View>(R.id.edit_text_out) as EditText
mOutEditText = view.findViewById<View>(R.id.edt_chatF_message) as EditText
mSendButton = view.findViewById<View>(R.id.button_send) as Button
connectionState = view.findViewById(R.id.btn_chatF_connectionState) as Button
subscribeOnButtons()
Expand Down Expand Up @@ -135,7 +135,7 @@ class ChatFragment : Fragment() {
mSendButton!!.setOnClickListener {
val view: View? = view
if (null != view) {
val textView = view.findViewById<View>(R.id.edit_text_out) as TextView
val textView = view.findViewById<View>(R.id.edt_chatF_message) as TextView
val message = textView.text.toString()
val m = MessageAck(
true,
Expand Down Expand Up @@ -413,22 +413,6 @@ class ChatFragment : Fragment() {
mChatService!!.connect(device, true)
}

override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.chat_fragment_menu, menu)
}

override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
R.id.connect_scan -> {
// val serverIntent = Intent(activity, DeviceListActivity::class.java)
// startActivityForResult(serverIntent, REQUEST_CONNECT_DEVICE_SECURE)
connectDevice()
return true
}
}
return false
}

override fun onStart() {
super.onStart()
if (!mBluetoothAdapter!!.isEnabled) {
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/bg_meessage.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:bottomLeftRadius="30dp" android:bottomRightRadius="30dp" android:topLeftRadius="30dp"/>
<solid android:color="@color/purple_200"/>
</shape>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_baseline_send_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
</vector>
16 changes: 16 additions & 0 deletions app/src/main/res/drawable/ic_circular_image.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<corners android:radius="0dp" />
<solid android:color="@color/purple_200" />
<padding
android:bottom="0dp"
android:left="0dp"
android:right="0dp"
android:top="0dp" />
<size
android:width="50dp"
android:height="50dp" />

</shape>

37 changes: 27 additions & 10 deletions app/src/main/res/layout/fragment_bluetooth_chat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/>

<FrameLayout
android:id="@+id/bottom_sheet"
android:id="@+id/frm_chatF_chatItems"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
Expand All @@ -45,24 +45,41 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bottom_sheet"
app:layout_constraintTop_toBottomOf="@+id/frm_chatF_chatItems"
>

<EditText
android:id="@+id/edit_text_out"
android:id="@+id/edt_chatF_message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_weight="1" />

<Button
android:id="@+id/button_send"
android:layout_gravity="center"
android:textDirection="rtl"
android:layout_weight="8"
android:layout_margin="3dp"
android:background="@drawable/bg_meessage"
android:maxLines="6"
android:padding="7dp"
android:textSize="16sp" />
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/send" />
android:layout_margin="1dp"
android:background="@drawable/ic_circular_image"
>

<Button
android:id="@+id/button_send"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:background="@drawable/ic_baseline_send_24"
android:text="@string/send" />

</FrameLayout>

</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>