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

Cleanup for user and channel info screen code

parent dd6081ce
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 206 additions and 241 deletions
app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoFragment.kt
+ 3
− 0
View file @ 2da52a44
...@@ -16,6 +16,7 @@ import de.kuschku.libquassel.util.helpers.value ...@@ -16,6 +16,7 @@ import de.kuschku.libquassel.util.helpers.value
import de.kuschku.quasseldroid.R import de.kuschku.quasseldroid.R
import de.kuschku.quasseldroid.ui.chat.topic.TopicActivity import de.kuschku.quasseldroid.ui.chat.topic.TopicActivity
import de.kuschku.quasseldroid.util.helper.combineLatest import de.kuschku.quasseldroid.util.helper.combineLatest
import de.kuschku.quasseldroid.util.helper.retint
import de.kuschku.quasseldroid.util.helper.toLiveData import de.kuschku.quasseldroid.util.helper.toLiveData
import de.kuschku.quasseldroid.util.irc.format.ContentFormatter import de.kuschku.quasseldroid.util.irc.format.ContentFormatter
import de.kuschku.quasseldroid.util.service.ServiceBoundFragment import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
...@@ -70,6 +71,7 @@ class ChannelInfoFragment : ServiceBoundFragment() { ...@@ -70,6 +71,7 @@ class ChannelInfoFragment : ServiceBoundFragment() {
intent.putExtra("buffer", arguments?.getInt("bufferId") ?: -1) intent.putExtra("buffer", arguments?.getInt("bufferId") ?: -1)
startActivity(intent) startActivity(intent)
} }
actionEditTopic.retint()
actionPart.setOnClickListener { actionPart.setOnClickListener {
viewModel.session.value?.orNull()?.let { session -> viewModel.session.value?.orNull()?.let { session ->
...@@ -82,6 +84,7 @@ class ChannelInfoFragment : ServiceBoundFragment() { ...@@ -82,6 +84,7 @@ class ChannelInfoFragment : ServiceBoundFragment() {
} }
} }
} }
actionPart.retint()
} }
}) })
......
app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt
+ 7
− 4
View file @ 2da52a44
...@@ -190,6 +190,12 @@ class UserInfoFragment : ServiceBoundFragment() { ...@@ -190,6 +190,12 @@ class UserInfoFragment : ServiceBoundFragment() {
} }
} }
} }
actionQuery.retint()
actionIgnore.setOnClickListener {
Toast.makeText(requireContext(), "Not Implemented", Toast.LENGTH_SHORT).show()
}
actionIgnore.retint()
actionMention.setOnClickListener { actionMention.setOnClickListener {
val intent = Intent(requireContext(), ChatActivity::class.java) val intent = Intent(requireContext(), ChatActivity::class.java)
...@@ -198,10 +204,7 @@ class UserInfoFragment : ServiceBoundFragment() { ...@@ -198,10 +204,7 @@ class UserInfoFragment : ServiceBoundFragment() {
startActivity(intent) startActivity(intent)
} }
actionMention.visibleIf(arguments?.getBoolean("openBuffer") == false) actionMention.visibleIf(arguments?.getBoolean("openBuffer") == false)
actionMention.retint()
actionIgnore.setOnClickListener {
Toast.makeText(requireContext(), "Not Implemented", Toast.LENGTH_SHORT).show()
}
} }
}) })
......
app/src/main/java/de/kuschku/quasseldroid/util/helper/ButtonHelper.kt 0 → 100644
+ 14
− 0
View file @ 2da52a44
package de.kuschku.quasseldroid.util.helper
import android.support.v4.graphics.drawable.DrawableCompat
import android.widget.Button
fun Button.retint() {
val (left, top, right, bottom) = compoundDrawables.map {
it?.apply {
it.mutate()
DrawableCompat.setTint(it, textColors.defaultColor)
}
}
setCompoundDrawables(left, top, right, bottom)
}
app/src/main/res/layout/fragment_info_channel.xml
+ 7
− 47
View file @ 2da52a44
...@@ -10,32 +10,16 @@ ...@@ -10,32 +10,16 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout style="@style/Widget.Info.Header">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?listPreferredItemHeight"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingTop="8dp">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
android:layout_width="match_parent" style="@style/Widget.Info.Header.Name"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
tools:text="#quassel" /> tools:text="#quassel" />
<TextView <TextView
android:id="@+id/topic" android:id="@+id/topic"
android:layout_width="match_parent" style="@style/Widget.Info.Header.Description"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
tools:text="Quassel IRC - https://quassel-irc.org || Latest: 0.12.4 || Mailing Lists: https://lists.quassel-irc.org || Tracker: https://bugs.quassel-irc.org || Activity RSS: #quassel-announce || German: #quassel.de || Quassel on Android: #quasseldroid; on iOS: #woboquassel || Server migration complete; new IPs may still need some time to propagate" /> tools:text="Quassel IRC - https://quassel-irc.org || Latest: 0.12.4 || Mailing Lists: https://lists.quassel-irc.org || Tracker: https://bugs.quassel-irc.org || Activity RSS: #quassel-announce || German: #quassel.de || Quassel on Android: #quasseldroid; on iOS: #woboquassel || Server migration complete; new IPs may still need some time to propagate" />
</LinearLayout> </LinearLayout>
...@@ -58,39 +42,15 @@ ...@@ -58,39 +42,15 @@
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
android:id="@+id/action_edit_topic" android:id="@+id/action_edit_topic"
android:layout_width="wrap_content" style="@style/Widget.Info.ActionButton"
android:layout_height="wrap_content"
android:background="?backgroundMenuItem"
android:drawablePadding="4dp"
android:drawableTop="@drawable/ic_pencil" android:drawableTop="@drawable/ic_pencil"
android:fontFamily="sans-serif" android:text="@string/label_edit_topic" />
android:minWidth="96dp"
android:paddingBottom="12dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="12dp"
android:text="@string/label_edit_topic"
android:textAllCaps="false"
android:textStyle="normal" />
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
android:id="@+id/action_part" android:id="@+id/action_part"
android:layout_width="wrap_content" style="@style/Widget.Info.ActionButton"
android:layout_height="wrap_content"
android:background="?backgroundMenuItem"
android:drawablePadding="4dp"
android:drawableTop="@drawable/ic_account_minus" android:drawableTop="@drawable/ic_account_minus"
android:fontFamily="sans-serif" android:text="@string/label_part" />
android:minWidth="96dp"
android:paddingBottom="12dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingTop="12dp"
android:text="@string/label_part"
android:textAllCaps="false"
android:textStyle="normal" />
</LinearLayout> </LinearLayout>
</HorizontalScrollView> </HorizontalScrollView>
......
app/src/main/res/layout/fragment_info_user.xml
+ 34
− 189
View file @ 2da52a44
...@@ -19,38 +19,23 @@ ...@@ -19,38 +19,23 @@
android:id="@+id/avatar" android:id="@+id/avatar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:contentDescription="@string/label_avatar"
android:scaleType="centerCrop" android:scaleType="centerCrop"
app:layout_constraintDimensionRatio="H,1.77:1" app:layout_constraintDimensionRatio="H,1.77:1"
tools:src="@tools:sample/avatars" /> tools:src="@tools:sample/avatars" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
<LinearLayout <LinearLayout style="@style/Widget.Info.Header">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?listPreferredItemHeight"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingTop="8dp">
<TextView <TextView
android:id="@+id/nick" android:id="@+id/nick"
android:layout_width="match_parent" style="@style/Widget.Info.Header.Name"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
tools:text="justJanne" /> tools:text="justJanne" />
<TextView <TextView
android:id="@+id/real_name" android:id="@+id/real_name"
android:layout_width="match_parent" style="@style/Widget.Info.Header.Description"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
tools:text="Janne Koschinski https://kuschku.de/" /> tools:text="Janne Koschinski https://kuschku.de/" />
</LinearLayout> </LinearLayout>
...@@ -73,58 +58,21 @@ ...@@ -73,58 +58,21 @@
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
android:id="@+id/action_query" android:id="@+id/action_query"
android:layout_width="wrap_content" style="@style/Widget.Info.ActionButton"
android:layout_height="wrap_content"
android:background="?backgroundMenuItem"
android:drawablePadding="4dp"
android:drawableTop="@drawable/ic_message_bulleted" android:drawableTop="@drawable/ic_message_bulleted"
android:fontFamily="sans-serif" android:text="@string/label_query" />
android:minWidth="96dp"
android:paddingBottom="12dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="12dp"
android:text="@string/label_query"
android:textAllCaps="false"
android:textStyle="normal" />
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
android:id="@+id/action_ignore" android:id="@+id/action_ignore"
android:layout_width="wrap_content" style="@style/Widget.Info.ActionButton"
android:layout_height="wrap_content"
android:background="?backgroundMenuItem"
android:drawablePadding="4dp"
android:drawableTop="@drawable/ic_eye_off" android:drawableTop="@drawable/ic_eye_off"
android:fontFamily="sans-serif" android:text="@string/label_ignore" />
android:minWidth="96dp"
android:paddingBottom="12dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingTop="12dp"
android:text="@string/label_ignore"
android:textAllCaps="false"
android:textStyle="normal" />
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
android:id="@+id/action_mention" android:id="@+id/action_mention"
android:layout_width="wrap_content" style="@style/Widget.Info.ActionButton"
android:layout_height="wrap_content"
android:background="?backgroundMenuItem"
android:drawablePadding="4dp"
android:drawableTop="@drawable/ic_share_alternative" android:drawableTop="@drawable/ic_share_alternative"
android:fontFamily="sans-serif" android:text="@string/label_mention" />
android:minWidth="96dp"
android:paddingBottom="12dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingTop="12dp"
android:text="@string/label_mention"
android:textAllCaps="false"
android:textStyle="normal" />
</LinearLayout> </LinearLayout>
</HorizontalScrollView> </HorizontalScrollView>
...@@ -140,47 +88,19 @@ ...@@ -140,47 +88,19 @@
android:background="?colorDivider" /> android:background="?colorDivider" />
<TextView <TextView
android:layout_width="match_parent" style="@style/Widget.Info.Section"
android:layout_height="wrap_content" android:text="@string/label_user_away" />
android:gravity="center_vertical"
android:minHeight="48dp"
android:paddingBottom="8dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingTop="8dp"
android:text="@string/label_user_away"
android:textColor="?colorTextPrimary"
android:textStyle="bold" />
<LinearLayout <LinearLayout style="@style/Widget.Info.Item">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingTop="16dp">
<TextView <TextView
android:id="@+id/away_message" android:id="@+id/away_message"
android:layout_width="match_parent" style="@style/Widget.Info.Item.Content"
android:layout_height="wrap_content"
android:textColor="?colorTextPrimary"
android:textSize="16sp"
tools:text="~justJanne" /> tools:text="~justJanne" />
<TextView <TextView
android:layout_width="wrap_content" style="@style/Widget.Info.Item.Description"
android:layout_height="wrap_content" android:text="@string/label_user_away_reason" />
android:text="@string/label_user_away_reason"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?colorTextSecondary" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
...@@ -190,138 +110,63 @@ ...@@ -190,138 +110,63 @@
android:background="?colorDivider" /> android:background="?colorDivider" />
<TextView <TextView
android:layout_width="match_parent" style="@style/Widget.Info.Section"
android:layout_height="wrap_content" android:text="@string/label_user_identity" />
android:gravity="center_vertical"
android:minHeight="48dp"
android:paddingBottom="8dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingTop="8dp"
android:text="@string/label_user_identity"
android:textColor="?colorTextPrimary"
android:textStyle="bold" />
<LinearLayout <LinearLayout
android:id="@+id/account_container" android:id="@+id/account_container"
android:layout_width="match_parent" style="@style/Widget.Info.Item">
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingTop="16dp">
<TextView <TextView
android:id="@+id/account" android:id="@+id/account"
android:layout_width="match_parent" style="@style/Widget.Info.Item.Content"
android:layout_height="wrap_content"
android:textColor="?colorTextPrimary"
android:textSize="16sp"
tools:text="kuschku" /> tools:text="kuschku" />
<TextView <TextView
android:layout_width="wrap_content" style="@style/Widget.Info.Item.Description"
android:layout_height="wrap_content" android:text="@string/label_user_account" />
android:text="@string/label_user_account"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?colorTextSecondary" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ident_container" android:id="@+id/ident_container"
android:layout_width="match_parent" style="@style/Widget.Info.Item">
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingTop="16dp">
<TextView <TextView
android:id="@+id/ident" android:id="@+id/ident"
android:layout_width="match_parent" style="@style/Widget.Info.Item.Content"
android:layout_height="wrap_content"
android:textColor="?colorTextPrimary"
android:textSize="16sp"
tools:text="~justJanne" /> tools:text="~justJanne" />
<TextView <TextView
android:layout_width="wrap_content" style="@style/Widget.Info.Item.Description"
android:layout_height="wrap_content" android:text="@string/label_user_ident" />
android:text="@string/label_user_ident"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?colorTextSecondary" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/host_container" android:id="@+id/host_container"
android:layout_width="match_parent" style="@style/Widget.Info.Item">
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingTop="16dp">
<TextView <TextView
android:id="@+id/host" android:id="@+id/host"
android:layout_width="match_parent" style="@style/Widget.Info.Item.Content"
android:layout_height="wrap_content"
android:textColor="?colorTextPrimary"
android:textSize="16sp"
tools:text="lithium.kuschku.de" /> tools:text="lithium.kuschku.de" />
<TextView <TextView
android:layout_width="wrap_content" style="@style/Widget.Info.Item.Description"
android:layout_height="wrap_content" android:text="@string/label_user_host" />
android:text="@string/label_user_host"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?colorTextSecondary" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/server_container" android:id="@+id/server_container"
android:layout_width="match_parent" style="@style/Widget.Info.Item">
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingTop="16dp">
<TextView <TextView
android:id="@+id/server" android:id="@+id/server"
android:layout_width="match_parent" style="@style/Widget.Info.Item.Content"
android:layout_height="wrap_content"
android:textColor="?colorTextPrimary"
android:textSize="16sp"
tools:text="irc.freenode.org" /> tools:text="irc.freenode.org" />
<TextView <TextView
android:layout_width="wrap_content" style="@style/Widget.Info.Item.Description"
android:layout_height="wrap_content" android:text="@string/label_user_server" />
android:text="@string/label_user_server"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?colorTextSecondary" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</android.support.v4.widget.NestedScrollView> </android.support.v4.widget.NestedScrollView>
app/src/main/res/values-v17/styles_widgets.xml
+ 62
− 1
View file @ 2da52a44
...@@ -45,4 +45,65 @@ ...@@ -45,4 +45,65 @@
<item name="android:layout_marginRight">8dp</item> <item name="android:layout_marginRight">8dp</item>
<item name="android:textColor">?colorTextSecondary</item> <item name="android:textColor">?colorTextSecondary</item>
</style> </style>
<style name="Widget.Info.Header" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_vertical</item>
<item name="android:minHeight">?listPreferredItemHeight</item>
<item name="android:orientation">vertical</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:paddingEnd">?android:attr/listPreferredItemPaddingRight</item>
<item name="android:paddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
<item name="android:paddingRight">?android:attr/listPreferredItemPaddingRight</item>
<item name="android:paddingStart">?android:attr/listPreferredItemPaddingLeft</item>
<item name="android:paddingTop">8dp</item>
</style>
<style name="Widget.Info.ActionButton" parent="">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:background">?backgroundMenuItem</item>
<item name="android:drawablePadding">4dp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:minWidth">96dp</item>
<item name="android:paddingBottom">12dp</item>
<item name="android:paddingEnd">?android:attr/listPreferredItemPaddingRight</item>
<item name="android:paddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
<item name="android:paddingRight">?android:attr/listPreferredItemPaddingRight</item>
<item name="android:paddingStart">?android:attr/listPreferredItemPaddingLeft</item>
<item name="android:paddingTop">12dp</item>
<item name="android:textAllCaps">false</item>
<item name="android:textColor">?colorTextPrimary</item>
<item name="android:textStyle">normal</item>
</style>
<style name="Widget.Info.Section" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_vertical</item>
<item name="android:minHeight">48dp</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:paddingEnd">?android:attr/listPreferredItemPaddingRight</item>
<item name="android:paddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
<item name="android:paddingRight">?android:attr/listPreferredItemPaddingRight</item>
<item name="android:paddingStart">?android:attr/listPreferredItemPaddingLeft</item>
<item name="android:paddingTop">8dp</item>
<item name="android:textColor">?colorTextPrimary</item>
<item name="android:textStyle">bold</item>
</style>
<style name="Widget.Info.Item" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_vertical</item>
<item name="android:minHeight">?android:attr/listPreferredItemHeightSmall</item>
<item name="android:orientation">vertical</item>
<item name="android:paddingBottom">16dp</item>
<item name="android:paddingEnd">?android:attr/listPreferredItemPaddingRight</item>
<item name="android:paddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
<item name="android:paddingRight">?android:attr/listPreferredItemPaddingRight</item>
<item name="android:paddingStart">?android:attr/listPreferredItemPaddingLeft</item>
<item name="android:paddingTop">16dp</item>
</style>
</resources> </resources>
app/src/main/res/values/styles_widgets.xml
+ 79
− 0
View file @ 2da52a44
...@@ -135,6 +135,85 @@ ...@@ -135,6 +135,85 @@
<item name="android:textColor">?colorTextSecondary</item> <item name="android:textColor">?colorTextSecondary</item>
</style> </style>
<style name="Widget.Info.Header" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_vertical</item>
<item name="android:minHeight">?listPreferredItemHeight</item>
<item name="android:orientation">vertical</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:paddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
<item name="android:paddingRight">?android:attr/listPreferredItemPaddingRight</item>
<item name="android:paddingTop">8dp</item>
</style>
<style name="Widget.Info.Header.Name" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Headline</item>
</style>
<style name="Widget.Info.Header.Description" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium</item>
</style>
<style name="Widget.Info.ActionButton" parent="">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:background">?backgroundMenuItem</item>
<item name="android:drawablePadding">4dp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:minWidth">96dp</item>
<item name="android:paddingBottom">12dp</item>
<item name="android:paddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
<item name="android:paddingRight">?android:attr/listPreferredItemPaddingRight</item>
<item name="android:paddingTop">12dp</item>
<item name="android:textAllCaps">false</item>
<item name="android:textColor">?colorTextPrimary</item>
<item name="android:textStyle">normal</item>
</style>
<style name="Widget.Info.Section" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_vertical</item>
<item name="android:minHeight">48dp</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:paddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
<item name="android:paddingRight">?android:attr/listPreferredItemPaddingRight</item>
<item name="android:paddingTop">8dp</item>
<item name="android:textColor">?colorTextPrimary</item>
<item name="android:textStyle">bold</item>
</style>
<style name="Widget.Info.Item" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_vertical</item>
<item name="android:minHeight">?android:attr/listPreferredItemHeightSmall</item>
<item name="android:orientation">vertical</item>
<item name="android:paddingBottom">16dp</item>
<item name="android:paddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
<item name="android:paddingRight">?android:attr/listPreferredItemPaddingRight</item>
<item name="android:paddingTop">16dp</item>
</style>
<style name="Widget.Info.Item.Content" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">?colorTextPrimary</item>
<item name="android:textSize">16sp</item>
</style>
<style name="Widget.Info.Item.Description" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
<item name="android:textColor">?colorTextSecondary</item>
</style>
<!-- NavigationDrawerLayout --> <!-- NavigationDrawerLayout -->
<declare-styleable name="NavigationDrawerLayout"> <declare-styleable name="NavigationDrawerLayout">
<attr name="insetBackground" /> <attr name="insetBackground" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment