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

There are some files used in this layout but it is not available in the project #114

Closed
wants to merge 2 commits into from
Closed
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
15 changes: 14 additions & 1 deletion TalkIn/.idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion TalkIn/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorMsgLeft" />
<solid android:color="@color/gray" />
<corners android:radius="4dp" />
</shape>
122 changes: 27 additions & 95 deletions TalkIn/app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,40 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">

<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"

android:layout_below="@id/main_toolbar"

android:layout_above="@id/divider"

/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/black"
android:id="@+id/main_toolbar"
android:padding="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Chats"
android:textSize="22sp"
android:textColor="@color/white"
android:textStyle="bold"
android:layout_marginStart="10dp"
android:layout_centerVertical="true"
/>
</RelativeLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/main_toolbar"
android:layout_above="@id/divider"
/>
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/userRecyclerView"

android:layout_below="@id/main_toolbar" />

android:layout_below="@id/main_toolbar"
android:layout_above="@id/divider"/>

<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_above="@id/bottom_navigation"/>
android:layout_above="@id/bottom_navigation"
android:id="@+id/divider"/>

<com.google.android.material.bottomnavigation.BottomNavigationView
android:layout_width="match_parent"
Expand All @@ -38,84 +49,5 @@
app:menu="@menu/bottom_navigation_menu"/>


<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">



<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ChatActivity">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/divider"
android:clipToPadding="false"
android:padding="8dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:stackFromEnd="true"
tools:listitem="@layout/item_message_base" />


<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_above="@id/linearLayout"
android:background="?android:attr/listDivider" />

<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true"
android:background="@color/white"
android:elevation="4dp"
android:orientation="horizontal"
android:paddingStart="8dp"
android:paddingEnd="8dp">

<ImageButton
android:id="@+id/photoPickerButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="8dp"
android:background="@drawable/ic_camera_alt_black_24dp"
android:padding="8dp" />

<EditText
android:id="@+id/messageEditText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/type_a_message"
/>

<ImageButton
android:id="@+id/sendButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:background="@drawable/selector_button_send"
android:padding="8dp" />
</LinearLayout>

<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true" />
</RelativeLayout>
</layout>
</RelativeLayout>
73 changes: 0 additions & 73 deletions TalkIn/app/src/main/res/layout/item_message_base.xml

This file was deleted.