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

Improved design of connection info bar

parent 22ef1907
Branches
Tags
No related merge requests found
Pipeline #268 passed
......@@ -5,13 +5,14 @@
android:id="@+id/connection_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorPrimaryDark"
android:background="?colorBackgroundSnackbar"
android:minHeight="32dp"
android:paddingLeft="16dp"
android:paddingTop="6dp"
android:paddingRight="16dp"
android:paddingBottom="6dp"
android:visibility="gone"
android:theme="?attr/actionBarTheme"
tools:visibility="visible">
<androidx.appcompat.widget.AppCompatImageView
......@@ -19,7 +20,9 @@
android:layout_width="20dp"
android:layout_height="20dp"
app:srcCompat="@drawable/ic_disconnected"
app:tint="?colorTextPrimaryInverse" />
android:visibility="gone"
app:tint="?android:textColorPrimary"
tools:visibility="visible" />
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
android:id="@+id/connection_status_progress"
......@@ -27,7 +30,8 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:indeterminate="true"
app:mpb_indeterminateTint="?colorTextPrimaryInverse" />
android:visibility="gone"
app:mpb_indeterminateTint="?android:textColorPrimary" />
<TextView
android:id="@+id/connection_status_text"
......@@ -35,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:textColor="?colorTextPrimaryInverse"
android:textColor="?android:textColorPrimary"
tools:text="@string/label_status_connecting" />
</LinearLayout>
......@@ -60,6 +60,7 @@
<attr name="colorBackgroundSecondary" format="color" />
<attr name="colorBackgroundCard" format="color" />
<attr name="colorBackgroundDialog" format="color" />
<attr name="colorBackgroundSnackbar" format="color" />
<attr name="colorMarkerLine" format="color" />
......
......@@ -119,6 +119,8 @@
<item name="android:textColor">?colorTextPrimary</item>
<item name="android:textColorSecondary">?colorTextSecondary</item>
<item name="colorControlNormal">?colorTextPrimary</item>
<item name="colorBackgroundSnackbar">?colorPrimaryDark</item>
</style>
<style name="Theme.ChatTheme.Light" parent="Base.ChatTheme.Light">
......@@ -159,9 +161,11 @@
<item name="android:textColorPrimary">?colorTextPrimary</item>
<item name="android:textColorSecondary">?colorTextSecondary</item>
<item name="colorControlNormal">?colorTextPrimary</item>
<item name="colorBackgroundSnackbar">?colorPrimary</item>
</style>
<style name="Theme.ChatTheme.Light.DarkHead" parent="Theme.ChatTheme.Light.Auto">
<style name="Theme.ChatTheme.Light.DarkHead" parent="Theme.ChatTheme.Light">
<item name="actionBarTheme">@style/Widget.AppBarOverlay.Light.DarkHead</item>
<item name="formatBarTheme">@style/Widget.AppBarOverlay.Light.Auto</item>
<item name="actionBarPopupTheme">@style/Widget.PopupOverlay.Light.Auto</item>
......@@ -171,6 +175,8 @@
<item name="android:textColorPrimary">?colorTextPrimary</item>
<item name="android:textColorSecondary">?colorTextSecondary</item>
<item name="colorControlNormal">?colorTextPrimary</item>
<item name="colorBackgroundSnackbar">?colorPrimaryDark</item>
</style>
<style name="Widget.PopupOverlay.Setup" parent="Widget.AppBarOverlay.Light">
......
......@@ -66,6 +66,7 @@
<item name="colorBackgroundSecondary">#44475a</item>
<item name="colorBackgroundCard">#44475a</item>
<item name="colorBackgroundDialog">#282a36</item>
<item name="colorBackgroundSnackbar">#373949</item>
<item name="colorOffline">#586e75</item>
<item name="colorAway">#586e75</item>
......
......@@ -127,6 +127,7 @@
<item name="colorBackgroundSecondary">#073642</item>
<item name="colorBackgroundCard">#073642</item>
<item name="colorBackgroundDialog">#002B36</item>
<item name="colorBackgroundSnackbar">#04313c</item>
<item name="colorOffline">#839496</item>
<item name="colorAway">#839496</item>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment