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

Prepare for new editor

parent 4c8a5661
No related branches found
No related tags found
No related merge requests found
Showing
with 338 additions and 269 deletions
...@@ -140,6 +140,7 @@ dependencies { ...@@ -140,6 +140,7 @@ dependencies {
// UI // UI
implementation("me.zhanghai.android.materialprogressbar", "library", "1.4.2") implementation("me.zhanghai.android.materialprogressbar", "library", "1.4.2")
implementation("com.afollestad.material-dialogs", "core", "0.9.6.0") implementation("com.afollestad.material-dialogs", "core", "0.9.6.0")
implementation(project(":slidingpanel"))
// Quality Assurance // Quality Assurance
implementation(project(":malheur")) implementation(project(":malheur"))
......
...@@ -10,12 +10,14 @@ import android.support.design.widget.Snackbar ...@@ -10,12 +10,14 @@ import android.support.design.widget.Snackbar
import android.support.v4.widget.DrawerLayout import android.support.v4.widget.DrawerLayout
import android.support.v7.app.ActionBarDrawerToggle import android.support.v7.app.ActionBarDrawerToggle
import android.support.v7.widget.Toolbar import android.support.v7.widget.Toolbar
import android.view.Gravity import android.text.InputType
import android.view.Menu import android.view.*
import android.view.MenuItem import android.widget.EditText
import android.widget.ImageButton
import butterknife.BindView import butterknife.BindView
import butterknife.ButterKnife import butterknife.ButterKnife
import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.MaterialDialog
import com.sothree.slidinguppanel.SlidingUpPanelLayout
import de.kuschku.libquassel.protocol.Message import de.kuschku.libquassel.protocol.Message
import de.kuschku.libquassel.protocol.Message_Type import de.kuschku.libquassel.protocol.Message_Type
import de.kuschku.libquassel.session.ConnectionState import de.kuschku.libquassel.session.ConnectionState
...@@ -45,6 +47,15 @@ class ChatActivity : ServiceBoundActivity() { ...@@ -45,6 +47,15 @@ class ChatActivity : ServiceBoundActivity() {
@BindView(R.id.progressBar) @BindView(R.id.progressBar)
lateinit var progressBar: MaterialContentLoadingProgressBar lateinit var progressBar: MaterialContentLoadingProgressBar
@BindView(R.id.editor_panel)
lateinit var editorPanel: SlidingUpPanelLayout
@BindView(R.id.send)
lateinit var send: ImageButton
@BindView(R.id.chatline)
lateinit var chatline: EditText
private lateinit var drawerToggle: ActionBarDrawerToggle private lateinit var drawerToggle: ActionBarDrawerToggle
private val handler = AndroidHandlerThread("Chat") private val handler = AndroidHandlerThread("Chat")
...@@ -57,6 +68,27 @@ class ChatActivity : ServiceBoundActivity() { ...@@ -57,6 +68,27 @@ class ChatActivity : ServiceBoundActivity() {
private lateinit var backlogSettings: BacklogSettings private lateinit var backlogSettings: BacklogSettings
private val panelSlideListener: SlidingUpPanelLayout.PanelSlideListener = object :
SlidingUpPanelLayout.PanelSlideListener {
override fun onPanelSlide(panel: View?, slideOffset: Float) = Unit
override fun onPanelStateChanged(panel: View?,
previousState: SlidingUpPanelLayout.PanelState?,
newState: SlidingUpPanelLayout.PanelState?) {
val selectionStart = chatline.selectionStart
val selectionEnd = chatline.selectionEnd
when (newState) {
SlidingUpPanelLayout.PanelState.COLLAPSED ->
chatline.inputType = chatline.inputType and InputType.TYPE_TEXT_FLAG_MULTI_LINE.inv()
else ->
chatline.inputType = chatline.inputType or InputType.TYPE_TEXT_FLAG_MULTI_LINE
}
chatline.setSelection(selectionStart, selectionEnd)
}
}
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
handler.onCreate() handler.onCreate()
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
...@@ -71,6 +103,17 @@ class ChatActivity : ServiceBoundActivity() { ...@@ -71,6 +103,17 @@ class ChatActivity : ServiceBoundActivity() {
setSupportActionBar(toolbar) setSupportActionBar(toolbar)
send.setOnClickListener {
send()
}
chatline.setOnKeyListener { _, keyCode, event ->
if (event.hasNoModifiers() && (keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_NUMPAD_ENTER)) {
send()
}
false
}
viewModel.getBuffer().observe( viewModel.getBuffer().observe(
this, Observer { this, Observer {
if (it != null && drawerLayout.isDrawerOpen(Gravity.START)) { if (it != null && drawerLayout.isDrawerOpen(Gravity.START)) {
...@@ -139,6 +182,20 @@ class ChatActivity : ServiceBoundActivity() { ...@@ -139,6 +182,20 @@ class ChatActivity : ServiceBoundActivity() {
progressBar.progress = progress progressBar.progress = progress
} }
) )
editorPanel.addPanelSlideListener(panelSlideListener)
editorPanel.panelState = SlidingUpPanelLayout.PanelState.COLLAPSED
}
fun send() {
viewModel.session { session ->
viewModel.getBuffer().let { bufferId ->
session.bufferSyncer?.bufferInfo(bufferId)?.also { bufferInfo ->
session.rpcHandler?.sendInput(bufferInfo, chatline.text.toString())
}
}
}
chatline.text.clear()
} }
override fun onSaveInstanceState(outState: Bundle?) { override fun onSaveInstanceState(outState: Bundle?) {
......
package de.kuschku.quasseldroid_ng.ui.chat
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import android.view.KeyEvent
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.EditText
import android.widget.ImageButton
import butterknife.BindView
import butterknife.ButterKnife
import de.kuschku.quasseldroid_ng.R
import de.kuschku.quasseldroid_ng.ui.settings.data.AppearanceSettings
import de.kuschku.quasseldroid_ng.ui.settings.data.Settings
import de.kuschku.quasseldroid_ng.ui.viewmodel.QuasselViewModel
import de.kuschku.quasseldroid_ng.util.helper.invoke
import de.kuschku.quasseldroid_ng.util.helper.let
import de.kuschku.quasseldroid_ng.util.irc.format.IrcFormatSerializer
import de.kuschku.quasseldroid_ng.util.service.ServiceBoundFragment
class EditorFragment : ServiceBoundFragment() {
@BindView(R.id.send)
lateinit var send: ImageButton
@BindView(R.id.chatline)
lateinit var chatline: EditText
private lateinit var viewModel: QuasselViewModel
private var ircFormatSerializer: IrcFormatSerializer? = null
private lateinit var appearanceSettings: AppearanceSettings
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
viewModel = ViewModelProviders.of(activity!!)[QuasselViewModel::class.java]
appearanceSettings = Settings.appearance(activity!!)
if (ircFormatSerializer == null) {
ircFormatSerializer = IrcFormatSerializer(context!!)
}
}
override fun onCreateView(inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?): View? {
val view = inflater.inflate(R.layout.fragment_editor, container, false)
ButterKnife.bind(this, view)
send.setOnClickListener {
send()
}
chatline.setOnKeyListener { _, keyCode, event ->
if (event.hasNoModifiers() && (keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_NUMPAD_ENTER)) {
send()
}
false
}
return view
}
fun send() {
viewModel.session { session ->
viewModel.getBuffer().let { bufferId ->
session.bufferSyncer?.bufferInfo(bufferId)?.also { bufferInfo ->
session.rpcHandler?.sendInput(bufferInfo, chatline.text.toString())
}
}
}
chatline.text.clear()
}
}
\ No newline at end of file
...@@ -42,68 +42,7 @@ ...@@ -42,68 +42,7 @@
android:background="?colorDivider" /> android:background="?colorDivider" />
</LinearLayout> </LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <include layout="@layout/layout_main" />
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarTheme">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:contentInsetStartWithNavigation="0dp"
app:popupTheme="@style/Widget.PopupOverlay">
<fragment
android:id="@+id/fragment_toolbar"
android:name="de.kuschku.quasseldroid_ng.ui.chat.ToolbarFragment"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
tools:layout="@layout/fragment_toolbar" />
</android.support.v7.widget.Toolbar>
<de.kuschku.quasseldroid_ng.util.ui.MaterialContentLoadingProgressBar
android:id="@+id/progressBar"
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal.NoPadding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:mpb_progressStyle="horizontal"
app:mpb_setBothDrawables="true"
app:mpb_useIntrinsicPadding="false"
tools:indeterminate="true" />
</FrameLayout>
</android.support.design.widget.AppBarLayout>
<fragment
android:id="@+id/fragment_messages"
android:name="de.kuschku.quasseldroid_ng.ui.chat.messages.MessageListFragment"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
tools:layout="@layout/fragment_messages" />
<fragment
android:id="@+id/fragment_editor"
android:name="de.kuschku.quasseldroid_ng.ui.chat.EditorFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_editor" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<fragment <fragment
......
...@@ -6,68 +6,7 @@ ...@@ -6,68 +6,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <include layout="@layout/layout_main" />
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarTheme">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:contentInsetStartWithNavigation="0dp"
app:popupTheme="?attr/actionBarPopupTheme">
<fragment
android:id="@+id/fragment_toolbar"
android:name="de.kuschku.quasseldroid_ng.ui.chat.ToolbarFragment"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
tools:layout="@layout/fragment_toolbar" />
</android.support.v7.widget.Toolbar>
<de.kuschku.quasseldroid_ng.util.ui.MaterialContentLoadingProgressBar
android:id="@+id/progressBar"
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal.NoPadding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:mpb_progressStyle="horizontal"
app:mpb_setBothDrawables="true"
app:mpb_useIntrinsicPadding="false"
tools:indeterminate="true" />
</FrameLayout>
</android.support.design.widget.AppBarLayout>
<fragment
android:id="@+id/fragment_messages"
android:name="de.kuschku.quasseldroid_ng.ui.chat.messages.MessageListFragment"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
tools:layout="@layout/fragment_messages" />
<fragment
android:id="@+id/fragment_editor"
android:name="de.kuschku.quasseldroid_ng.ui.chat.EditorFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_editor" />
</LinearLayout>
<fragment <fragment
android:id="@+id/fragment_nick_list" android:id="@+id/fragment_nick_list"
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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="wrap_content"
android:background="?colorBackgroundCard"
android:elevation="4dp"
tools:showIn="@layout/activity_main">
<android.support.v7.widget.AppCompatEditText
android:id="@+id/chatline"
android:layout_width="0dip"
android:layout_height="?attr/actionBarSize"
android:layout_weight="1"
android:background="@android:color/transparent"
android:gravity="top"
android:hint="@string/label_placeholder"
android:imeOptions="actionSend|flagNoEnterAction"
android:inputType="textCapSentences|textShortMessage|textAutoCorrect"
android:paddingBottom="17dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingTop="17dp"
android:textColor="?attr/colorForeground"
android:textSize="16sp" />
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/send"
style="?attr/buttonStyleSmall"
android:layout_width="?attr/actionBarSize"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="top"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="12dp"
android:scaleType="fitXY"
android:tint="?attr/colorAccent"
app:srcCompat="@drawable/ic_send" />
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout 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="match_parent">
<ScrollView
android:id="@+id/chatline_scroller"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="8dp"
app:layout_constraintBottom_toTopOf="@+id/formatting_toolbar_container"
app:layout_constraintEnd_toStartOf="@+id/send"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0">
<android.support.v7.widget.AppCompatEditText
android:id="@+id/chatline"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:gravity="top"
android:hint="@string/label_placeholder"
android:imeOptions="actionSend|flagNoEnterAction"
android:inputType="textCapSentences|textAutoCorrect|textShortMessage"
android:paddingBottom="17dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingTop="17dp"
android:textColor="?attr/colorForeground"
android:textSize="16sp" />
</ScrollView>
<android.support.v7.widget.AppCompatImageButton
android:id="@+id/send"
style="?attr/buttonStyleSmall"
android:layout_width="?attr/actionBarSize"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="top"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="12dp"
android:scaleType="fitXY"
android:tint="?attr/colorAccent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/ic_send" />
<android.support.design.widget.AppBarLayout
android:id="@+id/formatting_toolbar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorBackgroundCard"
app:layout_constraintBottom_toBottomOf="parent">
<android.support.v7.widget.Toolbar
android:id="@+id/formatting_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize">
<android.support.v7.widget.ActionMenuView
android:id="@+id/formatting_menu"
android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize" />
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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:fitsSystemWindows="true"
android:orientation="vertical">
<include layout="@layout/layout_toolbar" />
<com.sothree.slidinguppanel.SlidingUpPanelLayout
android:id="@+id/editor_panel"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
app:umanoAntiDragView="@id/card_panel"
app:umanoPanelHeight="?actionBarSize"
app:umanoScrollableView="@id/chatline_scroller"
app:umanoShadowHeight="4dp">
<fragment
android:id="@+id/fragment_messages"
android:name="de.kuschku.quasseldroid_ng.ui.chat.messages.MessageListFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_messages" />
<include layout="@layout/layout_slider" />
</com.sothree.slidinguppanel.SlidingUpPanelLayout>
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<com.sothree.slidinguppanel.SlidingUpPanelLayout 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="match_parent"
android:gravity="bottom"
app:umanoFadeColor="?colorBackground"
app:umanoOverlay="true"
app:umanoPanelHeight="0dip"
app:umanoScrollableView="@id/msg_history"
app:umanoShadowHeight="0dip">
<include layout="@layout/layout_editor" />
<FrameLayout
android:id="@+id/card_panel"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<android.support.v7.widget.CardView
style="?attr/cardStyle"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginBottom="16.0dip"
android:layout_marginLeft="16.0dip"
android:layout_marginRight="16.0dip"
android:layout_marginTop="16.0dip"
app:cardBackgroundColor="?attr/colorBackgroundCard">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<TextView
android:layout_width="fill_parent"
android:layout_height="48.0dip"
android:gravity="center_vertical"
android:paddingLeft="16.0dip"
android:paddingRight="16.0dip"
android:text="@string/label_input_history"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textColor="?attr/colorForegroundSecondary" />
<android.support.v7.widget.RecyclerView
android:id="@+id/msg_history"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
</LinearLayout>
</android.support.v7.widget.CardView>
</FrameLayout>
</com.sothree.slidinguppanel.SlidingUpPanelLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.AppBarLayout 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="wrap_content"
android:theme="?attr/actionBarTheme">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:contentInsetStartWithNavigation="0dp"
app:popupTheme="?attr/actionBarPopupTheme">
<fragment
android:id="@+id/fragment_toolbar"
android:name="de.kuschku.quasseldroid_ng.ui.chat.ToolbarFragment"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
tools:layout="@layout/fragment_toolbar" />
</android.support.v7.widget.Toolbar>
<de.kuschku.quasseldroid_ng.util.ui.MaterialContentLoadingProgressBar
android:id="@+id/progressBar"
style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal.NoPadding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
app:mpb_progressStyle="horizontal"
app:mpb_setBothDrawables="true"
app:mpb_useIntrinsicPadding="false"
tools:indeterminate="true" />
</FrameLayout>
</android.support.design.widget.AppBarLayout>
\ No newline at end of file
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<string name="label_drawer_close">Close</string> <string name="label_drawer_close">Close</string>
<string name="label_drawer_open">Open</string> <string name="label_drawer_open">Open</string>
<string name="label_filter_messages">Filter Messages</string> <string name="label_filter_messages">Filter Messages</string>
<string name="label_input_history">Input History</string>
<string name="label_placeholder">Write a message…</string> <string name="label_placeholder">Write a message…</string>
<string name="label_save">Save</string> <string name="label_save">Save</string>
<string name="label_select_multiple">Select</string> <string name="label_select_multiple">Select</string>
......
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
<style name="Widget.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"> <style name="Widget.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="drawerArrowStyle">@style/Widget.DrawerArrowToggle</item> <item name="drawerArrowStyle">@style/Widget.DrawerArrowToggle</item>
</style>
<style name="Widget.AppBarOverlay.Auto" parent="Widget.AppBarOverlay">
<item name="drawerArrowStyle">@style/Widget.DrawerArrowToggle</item>
<item name="colorControlNormal">?colorTextPrimary</item> <item name="colorControlNormal">?colorTextPrimary</item>
<item name="android:textColorPrimary">?colorTextPrimary</item> <item name="android:textColorPrimary">?colorTextPrimary</item>
<item name="android:textColorSecondary">?colorTextSecondary</item> <item name="android:textColorSecondary">?colorTextSecondary</item>
...@@ -17,6 +21,9 @@ ...@@ -17,6 +21,9 @@
<style name="Widget.AppBarOverlay.Light" parent="ThemeOverlay.AppCompat.ActionBar"> <style name="Widget.AppBarOverlay.Light" parent="ThemeOverlay.AppCompat.ActionBar">
<item name="drawerArrowStyle">@style/Widget.DrawerArrowToggle.Light</item> <item name="drawerArrowStyle">@style/Widget.DrawerArrowToggle.Light</item>
</style>
<style name="Widget.AppBarOverlay.Light.Auto" parent="Widget.AppBarOverlay.Light">
<item name="colorControlNormal">?colorTextPrimary</item> <item name="colorControlNormal">?colorTextPrimary</item>
<item name="android:textColorPrimary">?colorTextPrimary</item> <item name="android:textColorPrimary">?colorTextPrimary</item>
<item name="android:textColorSecondary">?colorTextSecondary</item> <item name="android:textColorSecondary">?colorTextSecondary</item>
...@@ -30,11 +37,15 @@ ...@@ -30,11 +37,15 @@
<item name="color">?attr/colorControlNormal</item> <item name="color">?attr/colorControlNormal</item>
</style> </style>
<style name="Widget.PopupOverlay" parent="ThemeOverlay.AppCompat"> <style name="Widget.PopupOverlay" parent="ThemeOverlay.AppCompat" />
<style name="Widget.PopupOverlay.Auto" parent="Widget.PopupOverlay">
<item name="android:colorBackground">?colorBackgroundCard</item> <item name="android:colorBackground">?colorBackgroundCard</item>
</style> </style>
<style name="Widget.PopupOverlay.Light" parent="ThemeOverlay.AppCompat.Light"> <style name="Widget.PopupOverlay.Light" parent="ThemeOverlay.AppCompat.Light" />
<style name="Widget.PopupOverlay.Light.Auto" parent="Widget.PopupOverlay.Light">
<item name="android:colorBackground">?colorBackgroundCard</item> <item name="android:colorBackground">?colorBackgroundCard</item>
</style> </style>
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<resources> <resources>
<color name="amoled_background">#000000</color> <color name="amoled_background">#000000</color>
<style name="Theme.ChatTheme.Amoled" parent="Theme.ChatTheme">
<style name="Theme.ChatTheme.Amoled" parent="Theme.ChatTheme.Auto">
<item name="colorPrimary">#000</item> <item name="colorPrimary">#000</item>
<item name="colorPrimaryDark">#000</item> <item name="colorPrimaryDark">#000</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
......
...@@ -48,10 +48,6 @@ ...@@ -48,10 +48,6 @@
<item name="colorOffline">@color/colorOfflineDark</item> <item name="colorOffline">@color/colorOfflineDark</item>
<item name="colorAway">@color/colorAwayDark</item> <item name="colorAway">@color/colorAwayDark</item>
<item name="android:textColor">?colorTextPrimary</item>
<item name="android:textColorSecondary">?colorTextSecondary</item>
<item name="colorControlNormal">?colorTextPrimary</item>
<item name="cardStyle">@style/CardView.Dark</item> <item name="cardStyle">@style/CardView.Dark</item>
<item name="mircColor0">#ffffff</item> <item name="mircColor0">#ffffff</item>
...@@ -72,6 +68,16 @@ ...@@ -72,6 +68,16 @@
<item name="mircColorF">#c0c0c0</item> <item name="mircColorF">#c0c0c0</item>
</style> </style>
<style name="Theme.ChatTheme.Auto" parent="Theme.ChatTheme">
<item name="actionBarTheme">@style/Widget.AppBarOverlay.Auto</item>
<item name="formatBarTheme">@style/Widget.AppBarOverlay.Auto</item>
<item name="actionBarPopupTheme">@style/Widget.PopupOverlay.Auto</item>
<item name="android:textColor">?colorTextPrimary</item>
<item name="android:textColorSecondary">?colorTextSecondary</item>
<item name="colorControlNormal">?colorTextPrimary</item>
</style>
<style name="Theme.ChatTheme.Light" parent="Base.ChatTheme.Light"> <style name="Theme.ChatTheme.Light" parent="Base.ChatTheme.Light">
<item name="actionBarTheme">@style/Widget.AppBarOverlay</item> <item name="actionBarTheme">@style/Widget.AppBarOverlay</item>
<item name="formatBarTheme">@style/Widget.AppBarOverlay.Light</item> <item name="formatBarTheme">@style/Widget.AppBarOverlay.Light</item>
...@@ -88,10 +94,6 @@ ...@@ -88,10 +94,6 @@
<item name="colorOffline">@color/colorOfflineLight</item> <item name="colorOffline">@color/colorOfflineLight</item>
<item name="colorAway">@color/colorAwayLight</item> <item name="colorAway">@color/colorAwayLight</item>
<item name="android:textColor">?colorTextPrimary</item>
<item name="android:textColorSecondary">?colorTextSecondary</item>
<item name="colorControlNormal">?colorTextPrimary</item>
<item name="cardStyle">@style/CardView.Light</item> <item name="cardStyle">@style/CardView.Light</item>
<item name="mircColor0">#ffffff</item> <item name="mircColor0">#ffffff</item>
...@@ -111,4 +113,14 @@ ...@@ -111,4 +113,14 @@
<item name="mircColorE">#808080</item> <item name="mircColorE">#808080</item>
<item name="mircColorF">#c0c0c0</item> <item name="mircColorF">#c0c0c0</item>
</style> </style>
<style name="Theme.ChatTheme.Light.Auto" parent="Theme.ChatTheme.Light">
<item name="actionBarTheme">@style/Widget.AppBarOverlay.Light.Auto</item>
<item name="formatBarTheme">@style/Widget.AppBarOverlay.Light.Auto</item>
<item name="actionBarPopupTheme">@style/Widget.PopupOverlay.Light.Auto</item>
<item name="android:textColor">?colorTextPrimary</item>
<item name="android:textColorSecondary">?colorTextSecondary</item>
<item name="colorControlNormal">?colorTextPrimary</item>
</style>
</resources> </resources>
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<resources> <resources>
<color name="gruvbox_light_background">#fbf1c7</color> <color name="gruvbox_light_background">#fbf1c7</color>
<style name="Theme.ChatTheme.Gruvbox_Light" parent="Theme.ChatTheme.Light">
<style name="Theme.ChatTheme.Gruvbox_Light" parent="Theme.ChatTheme.Light.Auto">
<item name="colorPrimary">?attr/colorBackgroundCard</item> <item name="colorPrimary">?attr/colorBackgroundCard</item>
<item name="colorPrimaryDark">#b6ae91</item> <item name="colorPrimaryDark">#b6ae91</item>
<item name="colorAccent">#d65d0e</item> <item name="colorAccent">#d65d0e</item>
...@@ -55,7 +56,8 @@ ...@@ -55,7 +56,8 @@
</style> </style>
<color name="gruvbox_dark_background">#282828</color> <color name="gruvbox_dark_background">#282828</color>
<style name="Theme.ChatTheme.Gruvbox_Dark" parent="Theme.ChatTheme">
<style name="Theme.ChatTheme.Gruvbox_Dark" parent="Theme.ChatTheme.Auto">
<item name="colorPrimary">?attr/colorBackgroundCard</item> <item name="colorPrimary">?attr/colorBackgroundCard</item>
<item name="colorPrimaryDark">#3c3734</item> <item name="colorPrimaryDark">#3c3734</item>
<item name="colorAccent">#d65d0e</item> <item name="colorAccent">#d65d0e</item>
......
...@@ -2,14 +2,7 @@ ...@@ -2,14 +2,7 @@
<resources> <resources>
<color name="quassel_light_background">#fafafa</color> <color name="quassel_light_background">#fafafa</color>
<style name="Widget.AppBarOverlay.Quassel_Light" parent="Widget.AppBarOverlay.Light">
<item name="colorControlNormal">@color/colorFillDark</item>
<item name="android:textColorPrimary">@color/colorFillDark</item>
</style>
<style name="Theme.ChatTheme.Quassel_Light" parent="Theme.ChatTheme.Light"> <style name="Theme.ChatTheme.Quassel_Light" parent="Theme.ChatTheme.Light">
<item name="actionBarTheme">@style/Widget.AppBarOverlay.Quassel_Light</item>
<item name="senderColor0">#cc0000</item> <item name="senderColor0">#cc0000</item>
<item name="senderColor1">#006cad</item> <item name="senderColor1">#006cad</item>
<item name="senderColor2">#4d9900</item> <item name="senderColor2">#4d9900</item>
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<resources> <resources>
<color name="solarized_light_background">#FDF6E3</color> <color name="solarized_light_background">#FDF6E3</color>
<style name="Theme.ChatTheme.Solarized_Light" parent="Theme.ChatTheme.Light">
<style name="Theme.ChatTheme.Solarized_Light" parent="Theme.ChatTheme.Light.Auto">
<item name="colorPrimary">?attr/colorBackgroundCard</item> <item name="colorPrimary">?attr/colorBackgroundCard</item>
<item name="colorPrimaryDark">#b0ac9e</item> <item name="colorPrimaryDark">#b0ac9e</item>
<item name="colorAccent">#B58900</item> <item name="colorAccent">#B58900</item>
...@@ -55,7 +56,8 @@ ...@@ -55,7 +56,8 @@
</style> </style>
<color name="solarized_dark_background">#002B36</color> <color name="solarized_dark_background">#002B36</color>
<style name="Theme.ChatTheme.Solarized_Dark" parent="Theme.ChatTheme">
<style name="Theme.ChatTheme.Solarized_Dark" parent="Theme.ChatTheme.Auto">
<item name="colorPrimary">?attr/colorBackgroundCard</item> <item name="colorPrimary">?attr/colorBackgroundCard</item>
<item name="colorPrimaryDark">?attr/colorBackground</item> <item name="colorPrimaryDark">?attr/colorBackground</item>
<item name="colorAccent">#B58900</item> <item name="colorAccent">#B58900</item>
......
include ':invokerannotations', ':invokergenerator', ':lib', ':malheur', ':app' include ':invokerannotations', ':invokergenerator', ':lib', ':malheur', ':app', ":slidingpanel"
rootProject.buildFileName = 'build.gradle.kts' rootProject.buildFileName = 'build.gradle.kts'
plugins {
id("com.android.library")
}
android {
compileSdkVersion(27)
buildToolsVersion("27.0.3")
defaultConfig {
minSdkVersion(14)
targetSdkVersion(27)
}
}
dependencies {
// App Compat
withVersion("27.0.2") {
implementation("com.android.support", "support-v4", version)
implementation("com.android.support", "support-annotations", version)
implementation("com.android.support", "recyclerview-v7", version)
}
}
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.sothree.slidinguppanel.library"
android:versionCode="17"
android:versionName="3.4.0"></manifest>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment