mirror of
https://github.com/KokaKiwi/BarInsta
synced 2026-03-05 12:01:35 +00:00
Add pending inbox
This commit is contained in:
Ammar Githam
parent
6aee7ea863
commit
5e3aed38b9
20 changed files with 794 additions and 95 deletions
11
app/src/main/res/drawable/ic_account_clock_24.xml
Normal file
11
app/src/main/res/drawable/ic_account_clock_24.xml
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="?attr/colorControlNormal"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#000"
|
||||
android:pathData="M10.63,14.1C12.23,10.58 16.38,9.03 19.9,10.63C23.42,12.23 24.97,16.38 23.37,19.9C22.24,22.4 19.75,24 17,24C14.3,24 11.83,22.44 10.67,20H1V18C1.06,16.86 1.84,15.93 3.34,15.18C4.84,14.43 6.72,14.04 9,14C9.57,14 10.11,14.05 10.63,14.1V14.1M9,4C10.12,4.03 11.06,4.42 11.81,5.17C12.56,5.92 12.93,6.86 12.93,8C12.93,9.14 12.56,10.08 11.81,10.83C11.06,11.58 10.12,11.95 9,11.95C7.88,11.95 6.94,11.58 6.19,10.83C5.44,10.08 5.07,9.14 5.07,8C5.07,6.86 5.44,5.92 6.19,5.17C6.94,4.42 7.88,4.03 9,4M17,22A5,5 0 0,0 22,17A5,5 0 0,0 17,12A5,5 0 0,0 12,17A5,5 0 0,0 17,22M16,14H17.5V16.82L19.94,18.23L19.19,19.53L16,17.69V14Z" />
|
||||
</vector>
|
||||
|
|
@ -11,12 +11,18 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:scrollbars="none"
|
||||
app:layout_constraintBottom_toTopOf="@id/reply_info"
|
||||
app:layout_constraintBottom_toTopOf="@id/chats_barrier"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:listitem="@layout/layout_dm_base" />
|
||||
|
||||
<androidx.constraintlayout.widget.Barrier
|
||||
android:id="@+id/chats_barrier"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
app:barrierDirection="bottom" />
|
||||
|
||||
<View
|
||||
android:id="@+id/reply_bg"
|
||||
android:layout_width="0dp"
|
||||
|
|
@ -44,7 +50,7 @@
|
|||
app:layout_constraintBottom_toTopOf="@id/reply_preview_text"
|
||||
app:layout_constraintEnd_toStartOf="@id/reply_preview_image"
|
||||
app:layout_constraintStart_toStartOf="@id/input_bg"
|
||||
app:layout_constraintTop_toBottomOf="@id/chats"
|
||||
app:layout_constraintTop_toBottomOf="@id/chats_barrier"
|
||||
tools:text="Replying to yourself"
|
||||
tools:visibility="gone" />
|
||||
|
||||
|
|
@ -110,6 +116,7 @@
|
|||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:background="@drawable/bg_input"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="@id/input"
|
||||
app:layout_constraintEnd_toStartOf="@id/send"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
@ -124,6 +131,7 @@
|
|||
android:layout_marginEnd="2dp"
|
||||
android:background="@android:color/transparent"
|
||||
android:scrollbars="none"
|
||||
android:visibility="gone"
|
||||
app:icon="@drawable/ic_face_24"
|
||||
app:iconGravity="textStart"
|
||||
app:iconSize="24dp"
|
||||
|
|
@ -148,6 +156,7 @@
|
|||
android:paddingBottom="12dp"
|
||||
android:textColor="@color/white"
|
||||
android:textColorHint="@color/grey_500"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/camera"
|
||||
app:layout_constraintStart_toEndOf="@id/emoji_toggle"
|
||||
|
|
@ -163,12 +172,13 @@
|
|||
android:paddingStart="4dp"
|
||||
android:paddingEnd="4dp"
|
||||
android:scaleType="fitCenter"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="@id/input_bg"
|
||||
app:layout_constraintEnd_toStartOf="@id/gallery"
|
||||
app:layout_constraintStart_toEndOf="@id/input"
|
||||
app:layout_constraintTop_toTopOf="@id/input"
|
||||
app:srcCompat="@drawable/ic_camera_24"
|
||||
tools:visibility="visible" />
|
||||
tools:visibility="gone" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageButton
|
||||
android:id="@+id/gallery"
|
||||
|
|
@ -181,22 +191,23 @@
|
|||
android:paddingEnd="4dp"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@drawable/ic_image_24"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="@id/input_bg"
|
||||
app:layout_constraintEnd_toStartOf="@id/send"
|
||||
app:layout_constraintStart_toEndOf="@id/camera"
|
||||
app:layout_constraintTop_toTopOf="@id/input"
|
||||
tools:visibility="visible" />
|
||||
tools:visibility="gone" />
|
||||
|
||||
<awais.instagrabber.customviews.RecordView
|
||||
android:id="@+id/record_view"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:visibility="visible"
|
||||
android:visibility="gone"
|
||||
app:counter_time_color="@color/white"
|
||||
app:layout_constraintBottom_toBottomOf="@id/input_bg"
|
||||
app:layout_constraintEnd_toEndOf="@id/input_bg"
|
||||
app:layout_constraintStart_toStartOf="@id/input"
|
||||
app:layout_constraintTop_toBottomOf="@id/chats"
|
||||
app:layout_constraintTop_toBottomOf="@id/chats_barrier"
|
||||
app:slide_to_cancel_arrow="@drawable/recv_ic_arrow"
|
||||
app:slide_to_cancel_arrow_color="@color/white"
|
||||
app:slide_to_cancel_bounds="0dp"
|
||||
|
|
@ -210,6 +221,7 @@
|
|||
style="@style/Widget.MaterialComponents.Button.Icon.NoInsets"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:visibility="gone"
|
||||
app:backgroundTint="@color/blue_900"
|
||||
app:elevation="4dp"
|
||||
app:icon="@drawable/avd_mic_to_send_anim"
|
||||
|
|
@ -226,17 +238,55 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="250dp"
|
||||
android:translationY="250dp"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
<View
|
||||
android:id="@+id/long_click_backdrop"
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/accept_pending_request_question"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:clickable="true"
|
||||
android:elevation="5dp"
|
||||
android:focusable="true"
|
||||
android:focusableInTouchMode="true"
|
||||
android:visibility="gone" />
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="16dp"
|
||||
android:paddingBottom="8dp"
|
||||
android:text="@string/accept_request_from_user"
|
||||
android:textAlignment="center"
|
||||
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toTopOf="@id/decline"
|
||||
app:layout_constraintTop_toBottomOf="@id/chats_barrier"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/decline"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?selectableItemBackground"
|
||||
android:padding="16dp"
|
||||
android:text="@string/decline"
|
||||
android:textAlignment="center"
|
||||
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
||||
android:textColor="@color/red_500"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/accept"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/accept_pending_request_question"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/accept"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?selectableItemBackground"
|
||||
android:padding="16dp"
|
||||
android:text="@string/accept"
|
||||
android:textAlignment="center"
|
||||
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/decline"
|
||||
app:layout_constraintTop_toBottomOf="@id/accept_pending_request_question"
|
||||
tools:visibility="visible" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
23
app/src/main/res/layout/fragment_direct_pending_inbox.xml
Normal file
23
app/src/main/res/layout/fragment_direct_pending_inbox.xml
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
|
||||
android:id="@+id/swipeRefreshLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="?attr/colorSurface"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/pending_inbox_list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:clipToPadding="false"
|
||||
android:paddingBottom="?attr/actionBarSize"
|
||||
tools:listitem="@layout/layout_dm_inbox_item" />
|
||||
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
|
|
@ -80,25 +80,7 @@
|
|||
|
||||
<action
|
||||
android:id="@+id/action_global_user_search"
|
||||
app:destination="@id/user_search_nav_graph">
|
||||
<!--<argument-->
|
||||
<!-- android:name="multiple"-->
|
||||
<!-- app:argType="boolean" />-->
|
||||
|
||||
<!--<argument-->
|
||||
<!-- android:name="title"-->
|
||||
<!-- app:argType="string"-->
|
||||
<!-- app:nullable="true" />-->
|
||||
|
||||
<!--<argument-->
|
||||
<!-- android:name="action_label"-->
|
||||
<!-- app:argType="string"-->
|
||||
<!-- app:nullable="true" />-->
|
||||
|
||||
<!--<argument-->
|
||||
<!-- android:name="hideUserIds"-->
|
||||
<!-- app:argType="long[]" />-->
|
||||
</action>
|
||||
app:destination="@id/user_search_nav_graph" />
|
||||
|
||||
<fragment
|
||||
android:id="@+id/directMessagesInboxFragment"
|
||||
|
|
@ -108,6 +90,9 @@
|
|||
<action
|
||||
android:id="@+id/action_inbox_to_thread"
|
||||
app:destination="@id/directMessagesThreadFragment" />
|
||||
<action
|
||||
android:id="@+id/action_inbox_to_pending_inbox"
|
||||
app:destination="@id/directPendingInboxFragment" />
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/directMessagesThreadFragment"
|
||||
|
|
@ -119,8 +104,12 @@
|
|||
<argument
|
||||
android:name="title"
|
||||
app:argType="string" />
|
||||
<argument
|
||||
android:name="pending"
|
||||
android:defaultValue="false"
|
||||
app:argType="boolean" />
|
||||
<action
|
||||
android:id="@+id/action_dMThreadFragment_to_dMSettingsFragment"
|
||||
android:id="@+id/action_thread_to_settings"
|
||||
app:destination="@id/directMessagesSettingsFragment" />
|
||||
<action
|
||||
android:id="@+id/action_thread_to_image_edit"
|
||||
|
|
@ -144,6 +133,11 @@
|
|||
app:argType="string"
|
||||
app:nullable="true" />
|
||||
|
||||
<argument
|
||||
android:name="pending"
|
||||
android:defaultValue="false"
|
||||
app:argType="boolean" />
|
||||
|
||||
<action
|
||||
android:id="@+id/action_settings_to_inbox"
|
||||
app:destination="@id/directMessagesInboxFragment"
|
||||
|
|
@ -170,4 +164,13 @@
|
|||
android:name="options"
|
||||
app:argType="awais.instagrabber.repositories.requests.StoryViewerOptions" />
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/directPendingInboxFragment"
|
||||
android:name="awais.instagrabber.fragments.directmessages.DirectPendingInboxFragment"
|
||||
android:label="@string/pending_requests"
|
||||
tools:layout="@layout/fragment_direct_pending_inbox">
|
||||
<action
|
||||
android:id="@+id/action_pending_inbox_to_thread"
|
||||
app:destination="@id/directMessagesThreadFragment" />
|
||||
</fragment>
|
||||
</navigation>
|
||||
|
|
@ -3,4 +3,5 @@
|
|||
<item name="reply" type="id" />
|
||||
<item name="unsend" type="id" />
|
||||
<item name="forward" type="id" />
|
||||
<item name="pending_requests" type="id" />
|
||||
</resources>
|
||||
|
|
@ -418,4 +418,8 @@
|
|||
<string name="dms_action_end">End chat</string>
|
||||
<string name="dms_action_end_question">End chat?</string>
|
||||
<string name="dms_action_end_description">All members will be removed from the group. They will still be able to view the chat history.</string>
|
||||
<string name="pending_requests">Pending Requests</string>
|
||||
<string name="accept_request_from_user">Accept request from %1s (%2s)?</string>
|
||||
<string name="decline">Decline</string>
|
||||
<string name="accept">Accept</string>
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue