Skip to content
Snippets Groups Projects
Verified Commit 5f3e964a authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Display the current new activity/messages/highlights status in toolbar

parent af4a4e1d
No related branches found
No related tags found
No related merge requests found
Showing
with 123 additions and 25 deletions
......@@ -17,7 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package de.kuschku.quasseldroid.util.ui
package de.kuschku.quasseldroid.util.ui.view
import android.annotation.SuppressLint
import android.content.Context
......@@ -64,7 +64,8 @@ class WarningBarView : FrameLayout {
text.text = it.getString(R.styleable.WarningBarView_text)
if (it.hasValue(R.styleable.WarningBarView_mode))
setMode(it.getInt(R.styleable.WarningBarView_mode, MODE_NONE))
setMode(it.getInt(R.styleable.WarningBarView_mode,
MODE_NONE))
}
}
......
<?xml version="1.0" encoding="utf-8"?><!--
Quasseldroid - Quassel client for Android
Copyright (c) 2019 Janne Koschinski
Copyright (c) 2019 The Quassel Project
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License version 3 as published
by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#000"
android:pathData="
M20,6 a-1,1 0 0,0 1,1 a-1,1 0 0,0 -1,1 l -16,0 a-1,1 0 0,0 -1,-1 a-1,1 0 0,0 1,-1Z
M20,11 a-1,1 0 0,0 1,1 a-1,1 0 0,0 -1,1 l -16,0 a-1,1 0 0,0 -1,-1 a-1,1 0 0,0 1,-1Z
M20,16 a-1,1 0 0,0 1,1 a-1,1 0 0,0 -1,1 l -16,0 a-1,1 0 0,0 -1,-1 a-1,1 0 0,0 1,-1Z" />
<path
android:fillColor="#f00"
android:pathData="M16,17 16,23 A1,1 0 0,0 17,24 L 23,24 A1,1 0 0,0 24,23 L 24,17 A1,1 0 0,0 23,16 L 17,16 A1,1 0 0,0 16,17" />
</vector>
......@@ -44,7 +44,7 @@
android:layout_height="match_parent"
tools:layout="@layout/chat_messages" />
<de.kuschku.quasseldroid.util.ui.WarningBarView
<de.kuschku.quasseldroid.util.ui.view.WarningBarView
android:id="@+id/connection_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -70,7 +70,7 @@
app:layout_anchor="@id/fragment_chatline"
app:layout_anchorGravity="top">
<de.kuschku.quasseldroid.util.ui.ShadowView
<de.kuschku.quasseldroid.util.ui.view.ShadowView
android:layout_width="match_parent"
android:layout_height="@dimen/shadow_height"
android:gravity="bottom" />
......
......@@ -50,7 +50,7 @@
android:layout_height="match_parent"
tools:layout="@layout/chat_messages" />
<de.kuschku.quasseldroid.util.ui.WarningBarView
<de.kuschku.quasseldroid.util.ui.view.WarningBarView
android:id="@+id/connection_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -76,7 +76,7 @@
app:layout_anchor="@id/fragment_chatline"
app:layout_anchorGravity="top">
<de.kuschku.quasseldroid.util.ui.ShadowView
<de.kuschku.quasseldroid.util.ui.view.ShadowView
android:layout_width="match_parent"
android:layout_height="@dimen/shadow_height"
android:gravity="bottom" />
......
<?xml version="1.0" encoding="utf-8"?><!--
Quasseldroid - Quassel client for Android
Copyright (c) 2019 Janne Koschinski
Copyright (c) 2019 The Quassel Project
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License version 3 as published
by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.drawerlayout.widget.DrawerLayout 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:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarTheme"
tools:showIn="@layout/activity_main">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:popupTheme="?attr/actionBarPopupTheme" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:scaleType="fitCenter" />
</LinearLayout>
<de.kuschku.quasseldroid.util.ui.view.NavigationDrawerLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="?attr/colorBackground"
android:fitsSystemWindows="true"
app:insetBackground="?attr/colorPrimaryDark" />
</androidx.drawerlayout.widget.DrawerLayout>
......@@ -35,7 +35,7 @@
android:layout_gravity="end"
tools:layout="@layout/chat_nicklist" />
<de.kuschku.quasseldroid.util.ui.NavigationDrawerLayout
<de.kuschku.quasseldroid.util.ui.view.NavigationDrawerLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="start"
......@@ -49,5 +49,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/chat_chatlist" />
</de.kuschku.quasseldroid.util.ui.NavigationDrawerLayout>
</de.kuschku.quasseldroid.util.ui.view.NavigationDrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>
......@@ -52,7 +52,7 @@
<include layout="@layout/widget_search" />
<de.kuschku.quasseldroid.util.ui.WarningBarView
<de.kuschku.quasseldroid.util.ui.view.WarningBarView
android:id="@+id/feature_context_bufferactivitysync"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -17,7 +17,7 @@
with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<de.kuschku.quasseldroid.util.ui.DrawerRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
<de.kuschku.quasseldroid.util.ui.view.DrawerRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nickList"
style="@style/Widget.FastScroller"
......
......@@ -70,7 +70,7 @@
</LinearLayout>
<de.kuschku.quasseldroid.util.ui.MaterialContentLoadingProgressBar
<de.kuschku.quasseldroid.util.ui.view.MaterialContentLoadingProgressBar
android:id="@+id/progress"
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal.NoPadding"
android:layout_width="match_parent"
......@@ -86,7 +86,7 @@
</androidx.cardview.widget.CardView>
<de.kuschku.quasseldroid.util.ui.WarningBarView
<de.kuschku.quasseldroid.util.ui.view.WarningBarView
android:id="@+id/error"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -17,7 +17,7 @@
with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<de.kuschku.quasseldroid.util.ui.TouchInterceptingFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<de.kuschku.quasseldroid.util.ui.view.TouchInterceptingFrameLayout 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:id="@+id/card_panel"
......@@ -84,4 +84,4 @@
tools:listitem="@layout/widget_history_message" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</de.kuschku.quasseldroid.util.ui.TouchInterceptingFrameLayout>
</de.kuschku.quasseldroid.util.ui.view.TouchInterceptingFrameLayout>
......@@ -50,7 +50,7 @@
android:layout_height="match_parent"
tools:layout="@layout/chat_messages" />
<de.kuschku.quasseldroid.util.ui.WarningBarView
<de.kuschku.quasseldroid.util.ui.view.WarningBarView
android:id="@+id/connection_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -77,7 +77,7 @@
app:layout_anchor="@id/fragment_chatline"
app:layout_anchorGravity="top">
<de.kuschku.quasseldroid.util.ui.ShadowView
<de.kuschku.quasseldroid.util.ui.view.ShadowView
android:layout_width="match_parent"
android:layout_height="@dimen/shadow_height"
android:gravity="bottom" />
......
......@@ -45,7 +45,7 @@
</androidx.appcompat.widget.Toolbar>
<de.kuschku.quasseldroid.util.ui.MaterialContentLoadingProgressBar
<de.kuschku.quasseldroid.util.ui.view.MaterialContentLoadingProgressBar
android:id="@+id/progress_bar"
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal.NoPadding"
android:layout_width="match_parent"
......
......@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<de.kuschku.quasseldroid.util.ui.WarningBarView
<de.kuschku.quasseldroid.util.ui.view.WarningBarView
android:id="@+id/feature_context_coresidehighlights"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<de.kuschku.quasseldroid.util.ui.BannerView
<de.kuschku.quasseldroid.util.ui.view.BannerView
android:id="@+id/feature_context_missing"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -17,7 +17,7 @@
with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<de.kuschku.quasseldroid.util.ui.BannerView xmlns:android="http://schemas.android.com/apk/res/android"
<de.kuschku.quasseldroid.util.ui.view.BannerView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -82,7 +82,7 @@
android:layout_weight="1"
android:orientation="vertical">
<de.kuschku.quasseldroid.util.ui.RipplePassthroughTextView
<de.kuschku.quasseldroid.util.ui.view.RipplePassthroughTextView
android:id="@+id/combined"
style="@style/Widget.RtlConformTextView"
android:layout_width="match_parent"
......
......@@ -44,7 +44,7 @@
android:layout_weight="1"
android:background="?colorDivider" />
<de.kuschku.quasseldroid.util.ui.RipplePassthroughTextView
<de.kuschku.quasseldroid.util.ui.view.RipplePassthroughTextView
android:id="@+id/daychange"
style="@style/Widget.RtlConformTextView"
android:layout_width="wrap_content"
......
......@@ -59,7 +59,7 @@
android:layout_marginRight="@dimen/message_horizontal"
android:visibility="gone" />
<de.kuschku.quasseldroid.util.ui.RipplePassthroughTextView
<de.kuschku.quasseldroid.util.ui.view.RipplePassthroughTextView
android:id="@+id/combined"
style="@style/Widget.RtlConformTextView"
android:layout_width="0dip"
......
......@@ -59,7 +59,7 @@
android:layout_marginRight="@dimen/message_horizontal"
android:visibility="gone" />
<de.kuschku.quasseldroid.util.ui.RipplePassthroughTextView
<de.kuschku.quasseldroid.util.ui.view.RipplePassthroughTextView
android:id="@+id/combined"
style="@style/Widget.RtlConformTextView"
android:layout_width="0dip"
......
......@@ -59,7 +59,7 @@
android:layout_marginRight="@dimen/message_horizontal"
android:visibility="gone" />
<de.kuschku.quasseldroid.util.ui.RipplePassthroughTextView
<de.kuschku.quasseldroid.util.ui.view.RipplePassthroughTextView
android:id="@+id/combined"
style="@style/Widget.RtlConformTextView"
android:layout_width="0dip"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment