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.

Sign up for GitHub

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

Revert "Updating the Group icon attaching respective activities is on the way… #9" #113

Merged
merged 1 commit into from
May 15, 2024
Merged

Revert "Updating the Group icon attaching respective activities is on the way… #9" #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 0 additions & 26 deletions TalkIn/.idea/appInsightsSettings.xml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions TalkIn/.idea/misc.xml
View file
Open in desktop

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

7 changes: 2 additions & 5 deletions TalkIn/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,10 @@
android:supportsRtl="true"
android:theme="@style/Theme.TalkIn"
tools:targetApi="31">
<activity
android:name=".UserProfile"
android:exported="false" />
<activity
android:name=".ResetPasswordActivity"
android:exported="false"
android:theme="@style/Theme.AppCompat.NoActionBar" />
android:theme="@style/Theme.AppCompat.NoActionBar"
android:exported="false" />
<activity
android:name=".MobileAuthActivity"
android:exported="false" />
Expand Down
Binary file removed TalkIn/app/src/main/res/drawable/img_3.png
View file
Open in desktop
Binary file not shown.
Binary file removed TalkIn/app/src/main/res/drawable/img_4.png
View file
Open in desktop
Binary file not shown.
12 changes: 5 additions & 7 deletions TalkIn/app/src/main/res/layout/activity_chat.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
android:layout_height="match_parent"
tools:context=".ChatActivity">


<androidx.recyclerview.widget.RecyclerView
android:id="@+id/chatRecyclerView"
android:layout_above="@id/linearLayout"
Expand All @@ -32,15 +33,12 @@
android:paddingLeft="10dp"
android:layout_marginLeft="10dp"
android:layout_weight="90"/>

<ImageView
android:id="@+id/sendButton"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="20"
android:padding="5dp"
android:layout_gravity="right"
android:src="@drawable/img_4"/>
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/send"
android:layout_weight="20"/>

</LinearLayout>
</RelativeLayout>
13 changes: 4 additions & 9 deletions TalkIn/app/src/main/res/menu/bottom_navigation_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:title="Send"
android:icon="@drawable/img"
android:id="@+id/menu_send"
/>
<item android:title="Chats"
<item android:title="Chats"
android:icon="@drawable/img_2"
android:id="@+id/menu_chat"
/>
<item android:title="Groups"
android:icon="@drawable/img_3"
android:id="@+id/menu_groups"
<item android:title="Send"
android:icon="@drawable/img"
android:id="@+id/menu_send"
/>

<item android:title="Profile"
android:icon="@drawable/img_1"
android:id="@+id/menu_profile"
Expand Down
5 changes: 0 additions & 5 deletions TalkIn/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
<resources>
<string name="app_name">Talk-In</string>

<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>

<string name="welcome_to_talk_in">Welcome to Talk-In</string>

</resources>