diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_inbox.xml (renamed from app/src/main/res/layout/activity_view_message.xml) | 16 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_view_private_messages.xml | 52 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_inbox.xml (renamed from app/src/main/res/layout/fragment_view_messages.xml) | 12 | ||||
| -rw-r--r-- | app/src/main/res/menu/inbox_activity.xml (renamed from app/src/main/res/menu/view_message_activity.xml) | 2 |
4 files changed, 67 insertions, 15 deletions
diff --git a/app/src/main/res/layout/activity_view_message.xml b/app/src/main/res/layout/activity_inbox.xml index 8d357f52..b1c31795 100644 --- a/app/src/main/res/layout/activity_view_message.xml +++ b/app/src/main/res/layout/activity_inbox.xml @@ -4,25 +4,25 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@+id/coordinator_layout_view_message_activity" - tools:context=".Activity.ViewMessageActivity"> + android:id="@+id/coordinator_layout_inbox_activity" + tools:context=".Activity.InboxActivity"> <com.google.android.material.appbar.AppBarLayout - android:id="@+id/appbar_layout_view_message_activity" + android:id="@+id/appbar_layout_inbox_activity" android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> <com.google.android.material.appbar.CollapsingToolbarLayout - android:id="@+id/collapsing_toolbar_layout_view_message_activity" + android:id="@+id/collapsing_toolbar_layout_inbox_activity" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_scrollFlags="scroll|enterAlways" app:titleEnabled="false" - app:toolbarId="@+id/toolbar_view_message_activity"> + app:toolbarId="@+id/toolbar_inbox_activity"> <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar_view_message_activity" + android:id="@+id/toolbar_inbox_activity" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" @@ -32,7 +32,7 @@ </com.google.android.material.appbar.CollapsingToolbarLayout> <com.google.android.material.tabs.TabLayout - android:id="@+id/tab_layout_view_message_activity" + android:id="@+id/tab_layout_inbox_activity" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" @@ -46,7 +46,7 @@ </com.google.android.material.appbar.AppBarLayout> <androidx.viewpager.widget.ViewPager - android:id="@+id/view_pager_view_message_activity" + android:id="@+id/view_pager_inbox_activity" android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> diff --git a/app/src/main/res/layout/activity_view_private_messages.xml b/app/src/main/res/layout/activity_view_private_messages.xml new file mode 100644 index 00000000..bc663b3a --- /dev/null +++ b/app/src/main/res/layout/activity_view_private_messages.xml @@ -0,0 +1,52 @@ +<?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" + android:id="@+id/coordinator_layout_view_private_messages_activity" + tools:context=".Activity.ViewPrivateMessagesActivity"> + + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar_layout_view_private_messages_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:theme="@style/AppTheme.AppBarOverlay"> + + <com.google.android.material.appbar.CollapsingToolbarLayout + android:id="@+id/collapsing_toolbar_layout_view_private_messages_activity" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_scrollFlags="scroll|enterAlways" + app:titleEnabled="false" + app:toolbarId="@+id/toolbar_view_private_messages_activity"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar_view_private_messages_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + app:popupTheme="@style/AppTheme.PopupOverlay" + app:navigationIcon="?attr/homeAsUpIndicator" /> + + </com.google.android.material.appbar.CollapsingToolbarLayout> + + </com.google.android.material.appbar.AppBarLayout> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recycler_view_view_private_messages" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipToPadding="false" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/fab_view_private_messages_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|end" + android:layout_margin="@dimen/fab_margin" + app:srcCompat="@drawable/ic_add_day_night_24dp" + app:tint="@android:color/white" /> + +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_view_messages.xml b/app/src/main/res/layout/fragment_inbox.xml index a8f8439d..c064a90e 100644 --- a/app/src/main/res/layout/fragment_view_messages.xml +++ b/app/src/main/res/layout/fragment_inbox.xml @@ -3,15 +3,15 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".Fragment.ViewMessagesFragment"> + tools:context=".Fragment.InboxFragment"> <androidx.swiperefreshlayout.widget.SwipeRefreshLayout - android:id="@+id/swipe_refresh_layout_view_messages_fragment" + android:id="@+id/swipe_refresh_layout_inbox_fragment" android:layout_width="match_parent" android:layout_height="match_parent"> <androidx.recyclerview.widget.RecyclerView - android:id="@+id/recycler_view_view_messages_fragment" + android:id="@+id/recycler_view_inbox_fragment" android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" /> @@ -19,7 +19,7 @@ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> <LinearLayout - android:id="@+id/fetch_messages_info_linear_layout_view_messages_fragment" + android:id="@+id/fetch_messages_info_linear_layout_inbox_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerInParent="true" @@ -28,12 +28,12 @@ android:visibility="gone"> <ImageView - android:id="@+id/fetch_messages_info_image_view_view_messages_fragment" + android:id="@+id/fetch_messages_info_image_view_inbox_fragment" android:layout_width="150dp" android:layout_height="wrap_content" /> <TextView - android:id="@+id/fetch_messages_info_text_view_view_messages_fragment" + android:id="@+id/fetch_messages_info_text_view_inbox_fragment" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" diff --git a/app/src/main/res/menu/view_message_activity.xml b/app/src/main/res/menu/inbox_activity.xml index ae1bdfdc..f7d06665 100644 --- a/app/src/main/res/menu/view_message_activity.xml +++ b/app/src/main/res/menu/inbox_activity.xml @@ -2,7 +2,7 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> <item - android:id="@+id/action_refresh_view_message_activity" + android:id="@+id/action_refresh_inbox_activity" android:orderInCategory="1" android:title="@string/action_refresh" app:showAsAction="never" /> |