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

Prepare for buffer join/create UI

parent 1b549349
Branches
Tags
No related merge requests found
<component name="CopyrightManager">
<copyright>
<option name="allowReplaceRegexp" value="Quasseldroid" />
<option name="notice" value="Quasseldroid - Quassel client for Android&#10;&#10;Copyright (c) &amp;#36;today.year Janne Koschinski&#10;Copyright (c) &amp;#36;today.year The Quassel Project&#10;&#10;This program is free software: you can redistribute it and/or modify it&#10;under the terms of the GNU General Public License version 3 as published&#10;by the Free Software Foundation.&#10;&#10;This program is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License along&#10;with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;." />
<option name="myName" value="Quasseldroid" />
<option name="notice" value="Quasseldroid - Quassel client for Android&#10;&#10;Copyright (c) &amp;#36;today.year Janne Koschinski&#10;Copyright (c) &amp;#36;today.year Ken Børge Viktil&#10;Copyright (c) &amp;#36;today.year Magnus Fjell&#10;Copyright (c) &amp;#36;today.year Martin Sandsmark&#10;Copyright (c) &amp;#36;today.year The Quassel Project&#10;&#10;This program is free software: you can redistribute it and/or modify it&#10;under the terms of the GNU General Public License version 3 as published&#10;by the Free Software Foundation.&#10;&#10;This program is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License along&#10;with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;." />
</copyright>
</component>
\ No newline at end of file
<component name="CopyrightManager">
<settings>
<module2copyright>
<element module="Project Source Files" copyright="Quasseldroid" />
</module2copyright>
<LanguageOptions name="HTML">
<option name="fileTypeOverride" value="3" />
<option name="prefixLines" value="false" />
......
......@@ -152,6 +152,7 @@ dependencies {
}
// UI
implementation("com.leinardi.android", "speed-dial", "2.0.1")
implementation("me.zhanghai.android.materialprogressbar", "library", "1.6.1")
withVersion("0.9.6.0") {
implementation("com.afollestad.material-dialogs", "core", version)
......
......@@ -91,6 +91,10 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
@BindView(R.id.buffer_search_container)
lateinit var bufferSearchContainer: ViewGroup
/*
@BindView(R.id.fab)
lateinit var fab: SpeedDialView
*/
@Inject
lateinit var appearanceSettings: AppearanceSettings
......@@ -531,6 +535,42 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
bufferSearch.setText("")
}
/*
@ColorInt var colorLabel = 0
@ColorInt var colorLabelBackground = 0
view.context.theme.styledAttributes(R.attr.colorTextPrimary, R.attr.colorBackgroundCard) {
colorLabel = getColor(0, 0)
colorLabelBackground = getColor(1, 0)
}
fab.addActionItem(
SpeedDialActionItem.Builder(R.id.fab_create, R.drawable.ic_add)
.setFabImageTintColor(0xffffffffu.toInt())
.setLabel(R.string.label_create_channel)
.setLabelBackgroundColor(colorLabelBackground)
.setLabelColor(colorLabel)
.create()
)
fab.addActionItem(
SpeedDialActionItem.Builder(R.id.fab_join, R.drawable.ic_channel)
.setFabImageTintColor(0xffffffffu.toInt())
.setLabel(R.string.label_join_long)
.setLabelBackgroundColor(colorLabelBackground)
.setLabelColor(colorLabel)
.create()
)
fab.addActionItem(
SpeedDialActionItem.Builder(R.id.fab_query, R.drawable.ic_account)
.setFabImageTintColor(0xffffffffu.toInt())
.setLabel(R.string.label_query_medium)
.setLabelBackgroundColor(colorLabelBackground)
.setLabelColor(colorLabel)
.create()
)
*/
return view
}
......
......@@ -23,6 +23,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#000"
android:fillColor="#fff"
android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
</vector>
......@@ -17,12 +17,11 @@
with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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:orientation="vertical">
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
......@@ -48,21 +47,46 @@
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<include layout="@layout/widget_search" />
<include layout="@layout/widget_search" />
<de.kuschku.quasseldroid.util.ui.view.WarningBarView
android:id="@+id/feature_context_bufferactivitysync"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_alert"
app:text="@string/label_feature_context_bufferactivitysync" />
<de.kuschku.quasseldroid.util.ui.view.WarningBarView
android:id="@+id/feature_context_bufferactivitysync"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_alert"
app:text="@string/label_feature_context_bufferactivitysync" />
</LinearLayout>
</com.google.android.material.appbar.AppBarLayout>
<de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
android:id="@+id/chatList"
style="@style/Widget.FastScroller"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:listitem="@layout/widget_buffer" />
</LinearLayout>
<!--
<com.leinardi.android.speeddial.SpeedDialOverlayLayout
android:id="@+id/overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<com.leinardi.android.speeddial.SpeedDialView
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
app:layout_behavior="@string/speeddial_scrolling_view_snackbar_behavior"
app:sdMainFabClosedSrc="@drawable/ic_add"
app:sdOverlayLayout="@id/overlay" />
-->
</androidx.coordinatorlayout.widget.CoordinatorLayout>
......@@ -23,4 +23,8 @@
<item name="tag_daychange_content" type="id" />
<item name="tag_markerline" type="id" />
<item name="fab_query" type="id" />
<item name="fab_join" type="id" />
<item name="fab_create" type="id" />
</resources>
......@@ -46,6 +46,7 @@
<string name="label_copy">Copy</string>
<string name="label_crashes">Crashes</string>
<string name="label_crashes_empty">No crash reports found</string>
<string name="label_create_channel">Create Channel</string>
<string name="label_delete">Delete</string>
<string name="label_delete_all">Delete All</string>
<string name="label_descending">Descending</string>
......@@ -102,6 +103,7 @@
<string name="label_privacy_policy">Privacy Policy</string>
<string name="label_query">Query</string>
<string name="label_query_long">Open private chat with user</string>
<string name="label_query_medium">Open private chat</string>
<string name="label_rename">Rename</string>
<string name="label_reply">Reply</string>
<string name="label_reset">Reset</string>
......
......@@ -33,9 +33,9 @@ android.enableD8=true
# Enable new Android R8 Optimizer
android.enableR8=true
# Enable gradle build cache
org.gradle.caching=true
org.gradle.caching=false
# Enable android build cache
android.enableBuildCache=true
android.enableBuildCache=false
# Enable AndroidX
android.useAndroidX=true
android.enableJetifier=true
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment