diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 63a018189245ee7706d665006fcec99c0ac333b9..ca5c72dcccfb89b26c90bf7f6b7a642270a48284 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -25,6 +25,19 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true">
+ <include
+ android:id="@+id/layout_main"
+ layout="@layout/layout_main" />
+
+ <fragment
+ android:id="@+id/fragment_nick_list"
+ android:name="de.kuschku.quasseldroid.ui.chat.nicks.NickListFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="end"
+ tools:ignore="FragmentTagUsage"
+ tools:layout="@layout/chat_nicklist" />
+
<de.kuschku.quasseldroid.util.ui.view.NavigationDrawerLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -41,15 +54,4 @@
tools:ignore="FragmentTagUsage"
tools:layout="@layout/chat_chatlist" />
</de.kuschku.quasseldroid.util.ui.view.NavigationDrawerLayout>
-
- <fragment
- android:id="@+id/fragment_nick_list"
- android:name="de.kuschku.quasseldroid.ui.chat.nicks.NickListFragment"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="end"
- tools:ignore="FragmentTagUsage"
- tools:layout="@layout/chat_nicklist" />
-
- <include android:id="@+id/layout_main" layout="@layout/layout_main" />
</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/add_create.xml b/app/src/main/res/layout/add_create.xml
index a1871b0094319a65b40c1b70c1057fe6f8c67e88..e9214418af636277f96d45d601eb431cbfb028b3 100644
--- a/app/src/main/res/layout/add_create.xml
+++ b/app/src/main/res/layout/add_create.xml
@@ -37,18 +37,6 @@
<LinearLayout style="@style/Widget.CoreSettings.Wrapper">
- <com.google.android.material.textfield.TextInputLayout
- style="@style/Widget.CustomTextInput"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/label_channel_name">
-
- <com.google.android.material.textfield.TextInputEditText
- android:id="@+id/name"
- style="@style/Widget.CoreSettings.EditText"
- tools:text="#trees" />
- </com.google.android.material.textfield.TextInputLayout>
-
<de.kuschku.ui.spinner.MaterialSpinnerLayout
style="@style/Widget.CustomSpinnerLayout"
android:layout_width="match_parent"
@@ -63,6 +51,18 @@
tools:listitem="@layout/widget_spinner_item_material" />
</de.kuschku.ui.spinner.MaterialSpinnerLayout>
+ <com.google.android.material.textfield.TextInputLayout
+ style="@style/Widget.CustomTextInput"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/label_channel_name">
+
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/name"
+ style="@style/Widget.CoreSettings.EditText"
+ tools:text="#trees" />
+ </com.google.android.material.textfield.TextInputLayout>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/chat_channel_join.xml b/app/src/main/res/layout/chat_channel_join.xml
index b464c337d6ec8c1698bc64cfcc0f2f8fafab7adb..3564417f8ca497d9bd42eaebe8ad09e3f64ec298 100644
--- a/app/src/main/res/layout/chat_channel_join.xml
+++ b/app/src/main/res/layout/chat_channel_join.xml
@@ -24,12 +24,19 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
- android:id="@+id/search_results"
- style="@style/Widget.FastScroller"
+ <de.kuschku.ui.spinner.MaterialSpinnerLayout
+ style="@style/Widget.CustomSpinnerLayout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:listitem="@layout/widget_channel_search" />
+ android:layout_height="wrap_content"
+ android:hint="@string/label_network">
+
+ <androidx.appcompat.widget.AppCompatSpinner
+ android:id="@+id/network"
+ style="@style/Widget.MaterialSpinner"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:listitem="@layout/widget_spinner_item_material" />
+ </de.kuschku.ui.spinner.MaterialSpinnerLayout>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
@@ -100,18 +107,11 @@
app:icon="@drawable/ic_alert"
app:mode="none" />
- <de.kuschku.ui.spinner.MaterialSpinnerLayout
- style="@style/Widget.CustomSpinnerLayout"
+ <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
+ android:id="@+id/search_results"
+ style="@style/Widget.FastScroller"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/label_network">
-
- <androidx.appcompat.widget.AppCompatSpinner
- android:id="@+id/network"
- style="@style/Widget.MaterialSpinner"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- tools:listitem="@layout/widget_spinner_item_material" />
- </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+ android:layout_height="match_parent"
+ tools:listitem="@layout/widget_channel_search" />
</LinearLayout>
diff --git a/app/src/main/res/layout/chat_chatlist.xml b/app/src/main/res/layout/chat_chatlist.xml
index fedcf742407af7c619ff40c3fdda1cda771c2aa2..6ac291043af387511c1f369958304f2bd669cf07 100644
--- a/app/src/main/res/layout/chat_chatlist.xml
+++ b/app/src/main/res/layout/chat_chatlist.xml
@@ -53,14 +53,14 @@
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
+ <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" />
-
- <include layout="@layout/widget_search" />
</LinearLayout>
</com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/dialog_colorchooser_custom.xml b/app/src/main/res/layout/dialog_colorchooser_custom.xml
index b640bca165f3e4664b55ad64ba57c19b3014792c..348f547e6f1112c915732e2591f085061d3b86eb 100644
--- a/app/src/main/res/layout/dialog_colorchooser_custom.xml
+++ b/app/src/main/res/layout/dialog_colorchooser_custom.xml
@@ -27,6 +27,12 @@
android:paddingBottom="@dimen/md_title_frame_margin_bottom"
tools:ignore="PrivateResource">
+ <View
+ android:id="@+id/md_colorIndicator"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ tools:background="@color/md_material_blue_600" />
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -119,14 +125,14 @@
android:textSize="@dimen/md_content_textsize"
tools:ignore="HardcodedText" />
- <SeekBar
- android:id="@+id/md_colorG"
+ <androidx.appcompat.widget.AppCompatSeekBar
+ android:id="@+id/md_colorR"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@+id/md_colorR"
+ android:layout_below="@+id/md_colorA"
android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
- android:layout_toStartOf="@+id/md_colorGValue"
- android:layout_toEndOf="@+id/md_colorGLabel"
+ android:layout_toStartOf="@+id/md_colorRValue"
+ android:layout_toEndOf="@+id/md_colorRLabel"
android:focusable="true"
android:max="255" />
@@ -160,13 +166,14 @@
tools:ignore="HardcodedText" />
<SeekBar
- android:id="@+id/md_colorB"
+ android:id="@+id/md_colorG"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@+id/md_colorG"
+ android:layout_below="@+id/md_colorR"
android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
- android:layout_toStartOf="@+id/md_colorBValue"
- android:layout_toEndOf="@+id/md_colorBLabel"
+ android:layout_toStartOf="@+id/md_colorGValue"
+ android:layout_toEndOf="@+id/md_colorGLabel"
+ android:focusable="true"
android:max="255" />
<TextView
@@ -198,15 +205,14 @@
android:textSize="@dimen/md_content_textsize"
tools:ignore="HardcodedText" />
- <androidx.appcompat.widget.AppCompatSeekBar
- android:id="@+id/md_colorR"
+ <SeekBar
+ android:id="@+id/md_colorB"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@+id/md_colorA"
+ android:layout_below="@+id/md_colorG"
android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
- android:layout_toStartOf="@+id/md_colorRValue"
- android:layout_toEndOf="@+id/md_colorRLabel"
- android:focusable="true"
+ android:layout_toStartOf="@+id/md_colorBValue"
+ android:layout_toEndOf="@+id/md_colorBLabel"
android:max="255" />
<TextView
@@ -226,10 +232,4 @@
</RelativeLayout>
- <View
- android:id="@+id/md_colorIndicator"
- android:layout_width="match_parent"
- android:layout_height="120dp"
- tools:background="@color/md_material_blue_600" />
-
</LinearLayout>
diff --git a/app/src/main/res/layout/info_certificate.xml b/app/src/main/res/layout/info_certificate.xml
index 2a1f977e17ab62d38305eaf05c1bf0659a9521fc..0f7a7bbfbf94db4b6c0cf3b8858e6d068a18ada3 100644
--- a/app/src/main/res/layout/info_certificate.xml
+++ b/app/src/main/res/layout/info_certificate.xml
@@ -24,21 +24,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <TextView
- android:id="@+id/error"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:gravity="center"
- android:minHeight="?android:attr/listPreferredItemHeightSmall"
- android:paddingStart="?listPreferredItemPaddingLeft"
- android:paddingEnd="?listPreferredItemPaddingRight"
- android:text="@string/label_error_certificate_no_certificate"
- android:textColor="?colorTextSecondary"
- android:textStyle="italic"
- android:visibility="gone"
- tools:visibility="visible" />
-
<androidx.core.widget.NestedScrollView
android:id="@+id/content"
android:layout_width="match_parent"
@@ -245,4 +230,19 @@
android:layout_height="16dp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
+
+ <TextView
+ android:id="@+id/error"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:paddingStart="?listPreferredItemPaddingLeft"
+ android:paddingEnd="?listPreferredItemPaddingRight"
+ android:text="@string/label_error_certificate_no_certificate"
+ android:textColor="?colorTextSecondary"
+ android:textStyle="italic"
+ android:visibility="gone"
+ tools:visibility="visible" />
</FrameLayout>
diff --git a/app/src/main/res/layout/info_core.xml b/app/src/main/res/layout/info_core.xml
index 4b1f3a1d27f5cdfb4bb5f041bfd5b843344aefbe..8b5f3afe78a2f03de1535668da8d7822172fd756 100644
--- a/app/src/main/res/layout/info_core.xml
+++ b/app/src/main/res/layout/info_core.xml
@@ -56,13 +56,14 @@
android:text="@string/label_missing_features" />
</LinearLayout>
- <TextView
- style="@style/Widget.Info.Section"
- android:text="@string/label_core_uptime" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="?colorDivider" />
<TextView
style="@style/Widget.Info.Section"
- android:text="@string/label_core_security" />
+ android:text="@string/label_core_uptime" />
<LinearLayout
android:id="@+id/uptime_container"
@@ -81,10 +82,9 @@
android:layout_height="1dp"
android:background="?colorDivider" />
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="?colorDivider" />
+ <TextView
+ style="@style/Widget.Info.Section"
+ android:text="@string/label_core_security" />
<LinearLayout
style="@style/Widget.Info.Item"
diff --git a/app/src/main/res/layout/info_user.xml b/app/src/main/res/layout/info_user.xml
index 0ac01bda64a69a2021c69f02247c918bc6e62268..b10582711530edbfb0bc185f131a6f599a0d2f0e 100644
--- a/app/src/main/res/layout/info_user.xml
+++ b/app/src/main/res/layout/info_user.xml
@@ -23,6 +23,40 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+ <com.google.android.material.appbar.AppBarLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="#40000000"
+ app:elevation="0dip">
+
+ <com.google.android.material.appbar.CollapsingToolbarLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_scrollFlags="scroll">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_collapseMode="parallax">
+
+ <ImageView
+ android:id="@+id/avatar"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:adjustViewBounds="true"
+ android:contentDescription="@string/label_avatar"
+ android:scaleType="centerCrop"
+ app:layout_constraintDimensionRatio="1:1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:src="@tools:sample/avatars" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </com.google.android.material.appbar.CollapsingToolbarLayout>
+ </com.google.android.material.appbar.AppBarLayout>
+
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -52,36 +86,10 @@
tools:text="Janne Mareike Koschinski https://kuschku.de/" />
</LinearLayout>
- <LinearLayout
- android:id="@+id/away_container"
+ <View
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:visibility="gone"
- tools:visibility="visible">
-
- <TextView
- style="@style/Widget.Info.Section"
- android:text="@string/label_user_away" />
-
- <LinearLayout style="@style/Widget.Info.Item">
-
- <TextView
- android:id="@+id/away_message"
- style="@style/Widget.Info.Item.Content"
- android:textIsSelectable="true"
- tools:text="~justJanne" />
-
- <TextView
- style="@style/Widget.Info.Item.Description"
- android:text="@string/label_user_away_reason" />
- </LinearLayout>
-
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="?colorDivider" />
- </LinearLayout>
+ android:layout_height="1dp"
+ android:background="?colorDivider" />
<HorizontalScrollView
android:layout_width="match_parent"
@@ -135,19 +143,45 @@
</LinearLayout>
</HorizontalScrollView>
- <TextView
- style="@style/Widget.Info.Section"
- android:text="@string/label_user_identity" />
-
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?colorDivider" />
- <View
+ <LinearLayout
+ android:id="@+id/away_container"
android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="?colorDivider" />
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:visibility="gone"
+ tools:visibility="visible">
+
+ <TextView
+ style="@style/Widget.Info.Section"
+ android:text="@string/label_user_away" />
+
+ <LinearLayout style="@style/Widget.Info.Item">
+
+ <TextView
+ android:id="@+id/away_message"
+ style="@style/Widget.Info.Item.Content"
+ android:textIsSelectable="true"
+ tools:text="~justJanne" />
+
+ <TextView
+ style="@style/Widget.Info.Item.Description"
+ android:text="@string/label_user_away_reason" />
+ </LinearLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="?colorDivider" />
+ </LinearLayout>
+
+ <TextView
+ style="@style/Widget.Info.Section"
+ android:text="@string/label_user_identity" />
<LinearLayout
android:id="@+id/account_container"
@@ -227,38 +261,4 @@
android:layout_height="wrap_content" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
-
- <com.google.android.material.appbar.AppBarLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="#40000000"
- app:elevation="0dip">
-
- <com.google.android.material.appbar.CollapsingToolbarLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:layout_scrollFlags="scroll">
-
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:layout_collapseMode="parallax">
-
- <ImageView
- android:id="@+id/avatar"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:adjustViewBounds="true"
- android:contentDescription="@string/label_avatar"
- android:scaleType="centerCrop"
- app:layout_constraintDimensionRatio="1:1"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:src="@tools:sample/avatars" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-
- </com.google.android.material.appbar.CollapsingToolbarLayout>
- </com.google.android.material.appbar.AppBarLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml
index 22e77c757291864dbbe34605a89e3eb94de4d12c..d11f5d14abb2cc167b215a701dce914c6eba3bfe 100644
--- a/app/src/main/res/layout/layout_main.xml
+++ b/app/src/main/res/layout/layout_main.xml
@@ -25,28 +25,15 @@
android:fitsSystemWindows="true"
android:orientation="vertical">
+ <include
+ android:id="@+id/layout_toolbar"
+ layout="@layout/layout_toolbar" />
+
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_anchor="@id/fragment_chatline"
- app:layout_anchorGravity="top">
-
- <Space
- android:layout_width="match_parent"
- android:layout_height="@dimen/shadow_height" />
-
- <de.kuschku.quasseldroid.util.ui.view.ShadowView
- android:layout_width="match_parent"
- android:layout_height="@dimen/shadow_height"
- android:gravity="bottom" />
- </LinearLayout>
-
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -86,6 +73,23 @@
tools:listitem="@layout/widget_nick" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ app:layout_anchor="@id/fragment_chatline"
+ app:layout_anchorGravity="top">
+
+ <de.kuschku.quasseldroid.util.ui.view.ShadowView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/shadow_height"
+ android:gravity="bottom" />
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/shadow_height" />
+ </LinearLayout>
+
<fragment
android:id="@+id/fragment_chatline"
android:name="de.kuschku.quasseldroid.ui.chat.input.ChatlineFragment"
@@ -99,8 +103,4 @@
</androidx.coordinatorlayout.widget.CoordinatorLayout>
- <include
- android:id="@+id/layout_toolbar"
- layout="@layout/layout_toolbar" />
-
</LinearLayout>
diff --git a/app/src/main/res/layout/preference_vertical.xml b/app/src/main/res/layout/preference_vertical.xml
index 92a25068c5f6606cb14fed699b5afd7f10146407..3a675602cb48a0c27e7b75cae5390910c105ffc4 100644
--- a/app/src/main/res/layout/preference_vertical.xml
+++ b/app/src/main/res/layout/preference_vertical.xml
@@ -62,11 +62,15 @@
android:paddingTop="16dp"
android:paddingBottom="16dp">
- <LinearLayout
- android:id="@android:id/widget_frame"
- android:layout_width="match_parent"
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="vertical" />
+ android:ellipsize="marquee"
+ android:singleLine="true"
+ android:textColor="?colorTextPrimary"
+ android:textSize="16sp"
+ tools:text="Font Size" />
<TextView
android:id="@android:id/summary"
@@ -77,14 +81,10 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?colorTextSecondary" />
- <TextView
- android:id="@android:id/title"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:id="@android:id/widget_frame"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:ellipsize="marquee"
- android:singleLine="true"
- android:textColor="?colorTextPrimary"
- android:textSize="16sp"
- tools:text="Font Size" />
+ android:orientation="vertical" />
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/preferences_about_header.xml b/app/src/main/res/layout/preferences_about_header.xml
index b08ab6f8a4ffc2b17a31decdd26fac00fac1e664..b876f7a768ad9afab9e14902f3f6d861199a50c7 100644
--- a/app/src/main/res/layout/preferences_about_header.xml
+++ b/app/src/main/res/layout/preferences_about_header.xml
@@ -64,15 +64,6 @@
</LinearLayout>
</LinearLayout>
- <TextView
- style="@style/Widget.RtlConformTextView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="4dp"
- android:layout_marginRight="4dp"
- android:text="@string/app_description_long"
- android:textAlignment="gravity" />
-
<com.google.android.flexbox.FlexboxLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -83,9 +74,12 @@
app:alignItems="flex_start"
app:flexWrap="wrap">
- <Space
- android:layout_width="8dp"
- android:layout_height="wrap_content" />
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/action_website"
+ style="@style/Widget.Button.Colored"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/label_website" />
<Space
android:layout_width="8dp"
@@ -98,12 +92,9 @@
android:layout_height="wrap_content"
android:text="@string/label_source" />
- <com.google.android.material.button.MaterialButton
- android:id="@+id/action_website"
- style="@style/Widget.Button.Colored"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/label_website" />
+ <Space
+ android:layout_width="8dp"
+ android:layout_height="wrap_content" />
<com.google.android.material.button.MaterialButton
android:id="@+id/action_donate"
@@ -114,6 +105,15 @@
</com.google.android.flexbox.FlexboxLayout>
+ <TextView
+ style="@style/Widget.RtlConformTextView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="4dp"
+ android:layout_marginRight="4dp"
+ android:text="@string/app_description_long"
+ android:textAlignment="gravity" />
+
<com.google.android.material.button.MaterialButton
android:id="@+id/action_privacy_policy"
style="@style/Widget.Button.Borderless.Colored"
diff --git a/app/src/main/res/layout/settings_highlightlist.xml b/app/src/main/res/layout/settings_highlightlist.xml
index c23c9fc76c6317d78599b34d89a0eacc3419959f..98b5f9c383672edfd31c4a725a1daa059f6467d6 100644
--- a/app/src/main/res/layout/settings_highlightlist.xml
+++ b/app/src/main/res/layout/settings_highlightlist.xml
@@ -29,6 +29,14 @@
android:layout_height="wrap_content"
android:orientation="vertical">
+ <de.kuschku.quasseldroid.util.ui.view.WarningBarView
+ android:id="@+id/feature_context_coresidehighlights"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:icon="@drawable/ic_alert"
+ app:mode="none"
+ app:text="@string/label_feature_context_coresidehighlights" />
+
<LinearLayout style="@style/Widget.CoreSettings.Wrapper">
<LinearLayout
@@ -147,13 +155,5 @@
</LinearLayout>
</LinearLayout>
</LinearLayout>
-
- <de.kuschku.quasseldroid.util.ui.view.WarningBarView
- android:id="@+id/feature_context_coresidehighlights"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:icon="@drawable/ic_alert"
- app:mode="none"
- app:text="@string/label_feature_context_coresidehighlights" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/settings_highlightlist_rule.xml b/app/src/main/res/layout/settings_highlightlist_rule.xml
index f34f885c5d9d579e01bb82ec942395b595f0186f..c27b23144fde0236fc4a48cb1a4dca3ca183aad2 100644
--- a/app/src/main/res/layout/settings_highlightlist_rule.xml
+++ b/app/src/main/res/layout/settings_highlightlist_rule.xml
@@ -34,6 +34,16 @@
android:gravity="center_vertical"
android:minHeight="?listPreferredItemHeightSmall">
+ <androidx.appcompat.widget.AppCompatImageView
+ android:id="@+id/handle"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_vertical"
+ android:paddingStart="?listPreferredItemPaddingRight"
+ android:paddingEnd="32dp"
+ app:srcCompat="@drawable/ic_reorder"
+ app:tint="?colorTextSecondary" />
+
<LinearLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
@@ -42,6 +52,23 @@
android:paddingTop="16dp"
android:paddingBottom="16dp">
+ <TextView
+ android:id="@+id/match_all"
+ style="@style/Widget.RtlConformTextView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:ellipsize="marquee"
+ android:orientation="vertical"
+ android:singleLine="true"
+ android:text="@string/label_match_all"
+ android:textAppearance="?android:textAppearanceMedium"
+ android:textColor="?colorTextPrimary"
+ android:textSize="16sp"
+ android:textStyle="italic"
+ android:visibility="gone"
+ tools:visibility="visible" />
+
<LinearLayout
android:id="@+id/name_row"
android:layout_width="match_parent"
@@ -123,35 +150,8 @@
tools:text="#yepityha" />
</LinearLayout>
- <TextView
- android:id="@+id/match_all"
- style="@style/Widget.RtlConformTextView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:ellipsize="marquee"
- android:orientation="vertical"
- android:singleLine="true"
- android:text="@string/label_match_all"
- android:textAppearance="?android:textAppearanceMedium"
- android:textColor="?colorTextPrimary"
- android:textSize="16sp"
- android:textStyle="italic"
- android:visibility="gone"
- tools:visibility="visible" />
-
</LinearLayout>
- <androidx.appcompat.widget.AppCompatImageView
- android:id="@+id/handle"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center_vertical"
- android:paddingStart="?listPreferredItemPaddingRight"
- android:paddingEnd="32dp"
- app:srcCompat="@drawable/ic_reorder"
- app:tint="?colorTextSecondary" />
-
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/toggle"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/settings_identity.xml b/app/src/main/res/layout/settings_identity.xml
index 473133c8e8ddb55b3a749f6e44b8c3ec23baa382..9cbb5681923d4bf7d009dbe01b622f66336be564 100644
--- a/app/src/main/res/layout/settings_identity.xml
+++ b/app/src/main/res/layout/settings_identity.xml
@@ -192,6 +192,23 @@
style="@style/Widget.CoreSettings.DependentGroup"
android:visibility="visible">
+ <com.google.android.material.textfield.TextInputLayout
+ style="@style/Widget.CustomTextInput"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/settings_identity_away_reason">
+
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/away_reason"
+ style="@style/Widget.CoreSettings.EditText"
+ tools:text="Gone Fishing." />
+ </com.google.android.material.textfield.TextInputLayout>
+
+ <androidx.appcompat.widget.SwitchCompat
+ android:id="@+id/detach_away"
+ style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+ android:text="@string/settings_identity_detach_away" />
+
<LinearLayout
android:id="@+id/detach_away_group"
android:layout_width="match_parent"
@@ -209,23 +226,6 @@
tools:text="Gone Fishing." />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
-
- <androidx.appcompat.widget.SwitchCompat
- android:id="@+id/detach_away"
- style="@style/Widget.CoreSettings.PrimaryItemSwitch"
- android:text="@string/settings_identity_detach_away" />
-
- <com.google.android.material.textfield.TextInputLayout
- style="@style/Widget.CustomTextInput"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/settings_identity_away_reason">
-
- <com.google.android.material.textfield.TextInputEditText
- android:id="@+id/away_reason"
- style="@style/Widget.CoreSettings.EditText"
- tools:text="Gone Fishing." />
- </com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/settings_list.xml b/app/src/main/res/layout/settings_list.xml
index 600b14063bb85fa395eed1aa1ace805bf5ba5e6e..c02834b2fd4d6d073ef928b65e00e53433b6ae96 100644
--- a/app/src/main/res/layout/settings_list.xml
+++ b/app/src/main/res/layout/settings_list.xml
@@ -29,6 +29,15 @@
android:layout_height="wrap_content"
android:orientation="vertical">
+ <de.kuschku.quasseldroid.util.ui.view.BannerView
+ android:id="@+id/feature_context_missing"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="8dp"
+ app:buttonText="@string/label_feature_context_missing_button"
+ app:icon="@drawable/ic_alert"
+ app:text="@string/label_feature_context_missing" />
+
<LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroupHeader">
<androidx.appcompat.widget.AppCompatImageView
@@ -218,14 +227,5 @@
style="@style/Widget.CoreSettings.PrimaryItemSwitch"
android:text="@string/label_password_change" />
</LinearLayout>
-
- <de.kuschku.quasseldroid.util.ui.view.BannerView
- android:id="@+id/feature_context_missing"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- app:buttonText="@string/label_feature_context_missing_button"
- app:icon="@drawable/ic_alert"
- app:text="@string/label_feature_context_missing" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/settings_network.xml b/app/src/main/res/layout/settings_network.xml
index 70b9bbf63a78df89ffa56afcc72f1087bd012c93..01245c4d5508b1e3a423a7fa206e73922716a095 100644
--- a/app/src/main/res/layout/settings_network.xml
+++ b/app/src/main/res/layout/settings_network.xml
@@ -366,10 +366,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <TextView
- style="@style/Widget.CoreSettings.EditTextSuffix"
- android:text="@string/settings_network_customratelimits_interval_unit" />
-
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.CustomTextInput"
android:layout_width="match_parent"
@@ -381,6 +377,10 @@
style="@style/Widget.CoreSettings.EditText"
tools:text="2.20" />
</com.google.android.material.textfield.TextInputLayout>
+
+ <TextView
+ style="@style/Widget.CoreSettings.EditTextSuffix"
+ android:text="@string/settings_network_customratelimits_interval_unit" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/settings_passwordchange.xml b/app/src/main/res/layout/settings_passwordchange.xml
index 26c1ed462218c099059797677ba64ed1ac4b347a..e246ed3fdf7608046c2862cf467efb8b3261bc8a 100644
--- a/app/src/main/res/layout/settings_passwordchange.xml
+++ b/app/src/main/res/layout/settings_passwordchange.xml
@@ -30,44 +30,42 @@
android:orientation="vertical"
android:padding="32dp">
- <LinearLayout
+ <com.google.android.material.textfield.TextInputLayout
+ android:id="@+id/userWrapper"
+ style="@style/Widget.CustomTextInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <Space
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:layout_weight="1" />
+ android:layout_marginBottom="16dp"
+ android:hint="@string/label_account_user"
+ tools:ignore="LabelFor">
- <com.google.android.material.button.MaterialButton
- android:id="@+id/save"
- style="@style/Widget.Button.Colored"
- android:layout_width="wrap_content"
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/user"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/label_save" />
-
- <me.zhanghai.android.materialprogressbar.MaterialProgressBar
- android:id="@+id/progress"
- android:layout_width="32dp"
- android:layout_height="32dp"
- android:layout_gravity="center_vertical"
- android:visibility="gone"
- tools:visibility="visible" />
-
- </LinearLayout>
+ android:enabled="false"
+ android:inputType="textVisiblePassword|textNoSuggestions"
+ app:errorEnabled="true"
+ tools:text="kuschku" />
+ </com.google.android.material.textfield.TextInputLayout>
- <TextView
- android:id="@+id/error"
+ <com.google.android.material.textfield.TextInputLayout
+ android:id="@+id/password_old_wrapper"
+ style="@style/Widget.CustomTextInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="4dp"
- android:layout_marginRight="4dp"
android:layout_marginBottom="16dp"
- android:textColor="?colorForegroundError"
- android:visibility="gone"
- tools:text="Error occured: Passwords do not match"
- tools:visibility="visible" />
+ android:hint="@string/label_password_old"
+ app:passwordToggleEnabled="true"
+ tools:ignore="LabelFor">
+
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/password_old"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textPassword"
+ app:errorEnabled="true" />
+ </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.CustomTextInput"
@@ -104,42 +102,44 @@
</com.google.android.material.textfield.TextInputLayout>
- <com.google.android.material.textfield.TextInputLayout
- android:id="@+id/userWrapper"
- style="@style/Widget.CustomTextInput"
+ <TextView
+ android:id="@+id/error"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginLeft="4dp"
+ android:layout_marginRight="4dp"
android:layout_marginBottom="16dp"
- android:hint="@string/label_account_user"
- tools:ignore="LabelFor">
-
- <com.google.android.material.textfield.TextInputEditText
- android:id="@+id/user"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:enabled="false"
- android:inputType="textVisiblePassword|textNoSuggestions"
- app:errorEnabled="true"
- tools:text="kuschku" />
- </com.google.android.material.textfield.TextInputLayout>
+ android:textColor="?colorForegroundError"
+ android:visibility="gone"
+ tools:text="Error occured: Passwords do not match"
+ tools:visibility="visible" />
- <com.google.android.material.textfield.TextInputLayout
- android:id="@+id/password_old_wrapper"
- style="@style/Widget.CustomTextInput"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:hint="@string/label_password_old"
- app:passwordToggleEnabled="true"
- tools:ignore="LabelFor">
+ android:orientation="horizontal">
- <com.google.android.material.textfield.TextInputEditText
- android:id="@+id/password_old"
- android:layout_width="match_parent"
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/save"
+ style="@style/Widget.Button.Colored"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:inputType="textPassword"
- app:errorEnabled="true" />
- </com.google.android.material.textfield.TextInputLayout>
+ android:text="@string/label_save" />
+
+ <Space
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+
+ <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+ android:id="@+id/progress"
+ android:layout_width="32dp"
+ android:layout_height="32dp"
+ android:layout_gravity="center_vertical"
+ android:visibility="gone"
+ tools:visibility="visible" />
+
+ </LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/setup_account_connection.xml b/app/src/main/res/layout/setup_account_connection.xml
index bbd8e9eff5f3916255dc3974aa76737de8889ca1..ac49fc80d7871d92b9b61063067f5adbbbd25e91 100644
--- a/app/src/main/res/layout/setup_account_connection.xml
+++ b/app/src/main/res/layout/setup_account_connection.xml
@@ -27,44 +27,44 @@
android:orientation="vertical"
android:padding="32dp">
- <androidx.appcompat.widget.SwitchCompat
- android:id="@+id/require_ssl"
- style="@style/Widget.CoreSettings.PrimaryItemSwitch"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/label_connection_ssl" />
-
<com.google.android.material.textfield.TextInputLayout
- android:id="@+id/portWrapper"
+ android:id="@+id/hostWrapper"
style="@style/Widget.CustomTextInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/label_connection_port"
+ android:hint="@string/label_connection_host"
app:errorEnabled="true"
tools:ignore="LabelFor">
<com.google.android.material.textfield.TextInputEditText
- android:id="@+id/port"
+ android:id="@+id/host"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="number"
- android:text="@string/defaultConnectionPort" />
+ android:inputType="textUri" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
- android:id="@+id/hostWrapper"
+ android:id="@+id/portWrapper"
style="@style/Widget.CustomTextInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/label_connection_host"
+ android:hint="@string/label_connection_port"
app:errorEnabled="true"
tools:ignore="LabelFor">
<com.google.android.material.textfield.TextInputEditText
- android:id="@+id/host"
+ android:id="@+id/port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="textUri" />
+ android:inputType="number"
+ android:text="@string/defaultConnectionPort" />
</com.google.android.material.textfield.TextInputLayout>
+ <androidx.appcompat.widget.SwitchCompat
+ android:id="@+id/require_ssl"
+ style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/label_connection_ssl" />
+
</LinearLayout>
diff --git a/app/src/main/res/layout/setup_account_edit.xml b/app/src/main/res/layout/setup_account_edit.xml
index 26d6d956d5670eaac3d1a987a7431bbc4fb8227f..f8af1268bf010f62bb80092c1d5f9ca9308ed1be 100644
--- a/app/src/main/res/layout/setup_account_edit.xml
+++ b/app/src/main/res/layout/setup_account_edit.xml
@@ -28,6 +28,10 @@
android:layout_height="wrap_content"
android:orientation="vertical">
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="16dp" />
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -42,106 +46,102 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
- app:srcCompat="@drawable/ic_server_network"
+ app:srcCompat="@drawable/ic_pencil"
app:tint="?android:textColorSecondary"
tools:ignore="ContentDescription" />
</FrameLayout>
- <LinearLayout
+ <com.google.android.material.textfield.TextInputLayout
+ android:id="@+id/nameWrapper"
+ style="@style/Widget.CustomTextInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:hint="@string/label_account_name"
+ tools:ignore="LabelFor">
- <androidx.appcompat.widget.SwitchCompat
- android:id="@+id/require_ssl"
- style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/label_connection_ssl" />
+ android:inputType="text"
+ app:errorEnabled="true" />
+ </com.google.android.material.textfield.TextInputLayout>
+ </LinearLayout>
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="16dp" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp">
+
+ <FrameLayout
+ android:layout_width="56dp"
+ android:layout_height="68dp">
+
+ <androidx.appcompat.widget.AppCompatImageView
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="center_vertical"
+ app:srcCompat="@drawable/ic_server_network"
+ app:tint="?android:textColorSecondary"
+ tools:ignore="ContentDescription" />
+ </FrameLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
- android:id="@+id/portWrapper"
+ android:id="@+id/hostWrapper"
style="@style/Widget.CustomTextInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/label_connection_port"
+ android:hint="@string/label_connection_host"
tools:ignore="LabelFor">
<com.google.android.material.textfield.TextInputEditText
- android:id="@+id/port"
+ android:id="@+id/host"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="number"
- android:text="@string/defaultConnectionPort"
+ android:inputType="textUri"
app:errorEnabled="true" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
- android:id="@+id/hostWrapper"
+ android:id="@+id/portWrapper"
style="@style/Widget.CustomTextInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/label_connection_host"
+ android:hint="@string/label_connection_port"
tools:ignore="LabelFor">
<com.google.android.material.textfield.TextInputEditText
- android:id="@+id/host"
+ android:id="@+id/port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="textUri"
+ android:inputType="number"
+ android:text="@string/defaultConnectionPort"
app:errorEnabled="true" />
</com.google.android.material.textfield.TextInputLayout>
- </LinearLayout>
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingLeft="16dp"
- android:paddingRight="16dp">
-
- <FrameLayout
- android:layout_width="56dp"
- android:layout_height="68dp">
-
- <androidx.appcompat.widget.AppCompatImageView
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="center_vertical"
- app:srcCompat="@drawable/ic_pencil"
- app:tint="?android:textColorSecondary"
- tools:ignore="ContentDescription" />
- </FrameLayout>
- <com.google.android.material.textfield.TextInputLayout
- android:id="@+id/nameWrapper"
- style="@style/Widget.CustomTextInput"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/label_account_name"
- tools:ignore="LabelFor">
-
- <com.google.android.material.textfield.TextInputEditText
- android:id="@+id/name"
+ <androidx.appcompat.widget.SwitchCompat
+ android:id="@+id/require_ssl"
+ style="@style/Widget.CoreSettings.PrimaryItemSwitch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:inputType="text"
- app:errorEnabled="true" />
- </com.google.android.material.textfield.TextInputLayout>
+ android:text="@string/label_connection_ssl" />
+ </LinearLayout>
</LinearLayout>
<Space
android:layout_width="match_parent"
android:layout_height="16dp" />
- <Space
- android:layout_width="match_parent"
- android:layout_height="16dp" />
-
- <Space
- android:layout_width="match_parent"
- android:layout_height="16dp" />
-
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/setup_network_network.xml b/app/src/main/res/layout/setup_network_network.xml
index 1065b24ddee69af5dc9b7aeeba49697d2465d404..04c32fe74e57890e2a2e81d7b39f819e9e028ae0 100644
--- a/app/src/main/res/layout/setup_network_network.xml
+++ b/app/src/main/res/layout/setup_network_network.xml
@@ -25,18 +25,39 @@
android:orientation="vertical"
android:padding="32dp">
+ <de.kuschku.ui.spinner.MaterialSpinnerLayout
+ style="@style/Widget.CustomSpinnerLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/settings_network_title">
+
+ <androidx.appcompat.widget.AppCompatSpinner
+ android:id="@+id/network"
+ style="@style/Widget.MaterialSpinner"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:listitem="@layout/widget_spinner_item_material" />
+ </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+
<LinearLayout
android:id="@+id/network_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
- <androidx.appcompat.widget.SwitchCompat
- android:id="@+id/ssl_enabled"
- style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+ <de.kuschku.ui.spinner.MaterialSpinnerLayout
+ style="@style/Widget.CustomSpinnerLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/settings_networkserver_ssl_enabled" />
+ android:hint="@string/settings_identity_title">
+
+ <androidx.appcompat.widget.AppCompatSpinner
+ android:id="@+id/identity"
+ style="@style/Widget.MaterialSpinner"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:listitem="@layout/widget_spinner_item_material" />
+ </de.kuschku.ui.spinner.MaterialSpinnerLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/nameWrapper"
@@ -89,33 +110,12 @@
tools:ignore="HardcodedText" />
</com.google.android.material.textfield.TextInputLayout>
- <de.kuschku.ui.spinner.MaterialSpinnerLayout
- style="@style/Widget.CustomSpinnerLayout"
+ <androidx.appcompat.widget.SwitchCompat
+ android:id="@+id/ssl_enabled"
+ style="@style/Widget.CoreSettings.PrimaryItemSwitch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/settings_identity_title">
-
- <androidx.appcompat.widget.AppCompatSpinner
- android:id="@+id/identity"
- style="@style/Widget.MaterialSpinner"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- tools:listitem="@layout/widget_spinner_item_material" />
- </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+ android:text="@string/settings_networkserver_ssl_enabled" />
</LinearLayout>
- <de.kuschku.ui.spinner.MaterialSpinnerLayout
- style="@style/Widget.CustomSpinnerLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/settings_network_title">
-
- <androidx.appcompat.widget.AppCompatSpinner
- android:id="@+id/network"
- style="@style/Widget.MaterialSpinner"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- tools:listitem="@layout/widget_spinner_item_material" />
- </de.kuschku.ui.spinner.MaterialSpinnerLayout>
-
</LinearLayout>
diff --git a/app/src/main/res/layout/setup_user_network.xml b/app/src/main/res/layout/setup_user_network.xml
index 140f4ebc5b599cf3a6f17d7b170870fea3db918d..b60d6ad51daf0f3d9d6a6e1956848f64d805a676 100644
--- a/app/src/main/res/layout/setup_user_network.xml
+++ b/app/src/main/res/layout/setup_user_network.xml
@@ -25,18 +25,41 @@
android:orientation="vertical"
android:padding="32dp">
+ <de.kuschku.ui.spinner.MaterialSpinnerLayout
+ style="@style/Widget.CustomSpinnerLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/settings_network_title">
+
+ <androidx.appcompat.widget.AppCompatSpinner
+ android:id="@+id/network"
+ style="@style/Widget.MaterialSpinner"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:listitem="@layout/widget_spinner_item_material" />
+ </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+
<LinearLayout
android:id="@+id/network_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
- <androidx.appcompat.widget.SwitchCompat
- android:id="@+id/ssl_enabled"
- style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+ <com.google.android.material.textfield.TextInputLayout
+ android:id="@+id/nameWrapper"
+ style="@style/Widget.CustomTextInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/settings_networkserver_ssl_enabled" />
+ android:hint="@string/settings_network_network_name"
+ tools:ignore="LabelFor">
+
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textUri|textNoSuggestions"
+ app:errorEnabled="true" />
+ </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/hostWrapper"
@@ -73,35 +96,12 @@
tools:ignore="HardcodedText" />
</com.google.android.material.textfield.TextInputLayout>
- <com.google.android.material.textfield.TextInputLayout
- android:id="@+id/nameWrapper"
- style="@style/Widget.CustomTextInput"
+ <androidx.appcompat.widget.SwitchCompat
+ android:id="@+id/ssl_enabled"
+ style="@style/Widget.CoreSettings.PrimaryItemSwitch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="@string/settings_network_network_name"
- tools:ignore="LabelFor">
-
- <com.google.android.material.textfield.TextInputEditText
- android:id="@+id/name"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:inputType="textUri|textNoSuggestions"
- app:errorEnabled="true" />
- </com.google.android.material.textfield.TextInputLayout>
+ android:text="@string/settings_networkserver_ssl_enabled" />
</LinearLayout>
- <de.kuschku.ui.spinner.MaterialSpinnerLayout
- style="@style/Widget.CustomSpinnerLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/settings_network_title">
-
- <androidx.appcompat.widget.AppCompatSpinner
- android:id="@+id/network"
- style="@style/Widget.MaterialSpinner"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- tools:listitem="@layout/widget_spinner_item_material" />
- </de.kuschku.ui.spinner.MaterialSpinnerLayout>
-
</LinearLayout>
diff --git a/app/src/main/res/layout/widget_chatmessage_action.xml b/app/src/main/res/layout/widget_chatmessage_action.xml
index 3289e4c6063bdd9833c19b315963bd1f390654f1..72a3fad35a03005eff90b68d35e39f8930c64c51 100644
--- a/app/src/main/res/layout/widget_chatmessage_action.xml
+++ b/app/src/main/res/layout/widget_chatmessage_action.xml
@@ -23,6 +23,8 @@
android:layout_height="wrap_content"
android:orientation="vertical">
+ <include layout="@layout/widget_chatmessage_daychange" />
+
<LinearLayout
android:id="@+id/message_container"
android:layout_width="match_parent"
@@ -105,6 +107,4 @@
</LinearLayout>
</LinearLayout>
- <include layout="@layout/widget_chatmessage_daychange" />
-
</LinearLayout>
diff --git a/app/src/main/res/layout/widget_chatmessage_error.xml b/app/src/main/res/layout/widget_chatmessage_error.xml
index 83f2b33ff9160e7f0f4518883c2b33c33b216c2b..78f13ddf1f83d2a21a839900a3cdf825b9876f55 100644
--- a/app/src/main/res/layout/widget_chatmessage_error.xml
+++ b/app/src/main/res/layout/widget_chatmessage_error.xml
@@ -24,6 +24,8 @@
android:orientation="vertical"
tools:showIn="@layout/chat_messages">
+ <include layout="@layout/widget_chatmessage_daychange" />
+
<LinearLayout
android:id="@+id/message_container"
android:layout_width="match_parent"
@@ -78,6 +80,4 @@
tools:textSize="11.9sp"
tools:visibility="visible" />
</LinearLayout>
-
- <include layout="@layout/widget_chatmessage_daychange" />
</LinearLayout>
diff --git a/app/src/main/res/layout/widget_chatmessage_info.xml b/app/src/main/res/layout/widget_chatmessage_info.xml
index 29cb8dfe2d7fc6366467b790b387535b9ab10559..967f7a759eb9d42375d39a51012b8d2d0f3f1020 100644
--- a/app/src/main/res/layout/widget_chatmessage_info.xml
+++ b/app/src/main/res/layout/widget_chatmessage_info.xml
@@ -24,6 +24,8 @@
android:orientation="vertical"
tools:showIn="@layout/chat_messages">
+ <include layout="@layout/widget_chatmessage_daychange" />
+
<LinearLayout
android:id="@+id/message_container"
android:layout_width="match_parent"
@@ -79,6 +81,4 @@
tools:textSize="11.9sp"
tools:visibility="visible" />
</LinearLayout>
-
- <include layout="@layout/widget_chatmessage_daychange" />
</LinearLayout>
diff --git a/app/src/main/res/layout/widget_chatmessage_notice.xml b/app/src/main/res/layout/widget_chatmessage_notice.xml
index ccabeed9c3d912df2c16633f151d58c9200d9f62..3a442765786b02324c3a94de4a40592fdcdf807a 100644
--- a/app/src/main/res/layout/widget_chatmessage_notice.xml
+++ b/app/src/main/res/layout/widget_chatmessage_notice.xml
@@ -24,6 +24,8 @@
android:orientation="vertical"
tools:showIn="@layout/chat_messages">
+ <include layout="@layout/widget_chatmessage_daychange" />
+
<LinearLayout
android:id="@+id/message_container"
android:layout_width="match_parent"
@@ -78,6 +80,4 @@
tools:textSize="11.9sp"
tools:visibility="visible" />
</LinearLayout>
-
- <include layout="@layout/widget_chatmessage_daychange" />
</LinearLayout>
diff --git a/app/src/main/res/layout/widget_chatmessage_plain.xml b/app/src/main/res/layout/widget_chatmessage_plain.xml
index 63c58edf3ef8bb87b3f2428770e060b16aa1bfe9..9db3f272c372d389a5a0131e8e06b9f824e47e09 100644
--- a/app/src/main/res/layout/widget_chatmessage_plain.xml
+++ b/app/src/main/res/layout/widget_chatmessage_plain.xml
@@ -24,6 +24,8 @@
android:orientation="vertical"
tools:showIn="@layout/chat_messages">
+ <include layout="@layout/widget_chatmessage_daychange" />
+
<LinearLayout
android:id="@+id/message_container"
android:layout_width="match_parent"
@@ -36,6 +38,33 @@
android:paddingBottom="@dimen/message_vertical"
android:textAppearance="?android:attr/textAppearanceListItemSmall">
+ <TextView
+ android:id="@+id/time_left"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="top"
+ android:layout_marginEnd="@dimen/message_horizontal"
+ android:textColor="?attr/colorForegroundSecondary"
+ android:typeface="monospace"
+ tools:text="@sample/messages.json/data/time"
+ tools:visibility="gone" />
+
+ <FrameLayout
+ android:id="@+id/avatar_container"
+ android:layout_width="@dimen/avatar_size"
+ android:layout_height="@dimen/avatar_size"
+ android:layout_marginEnd="@dimen/message_horizontal"
+ android:visibility="gone"
+ tools:visibility="visible">
+
+ <ImageView
+ android:id="@+id/avatar"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:contentDescription="@string/label_avatar"
+ tools:src="@tools:sample/avatars" />
+ </FrameLayout>
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -125,35 +154,6 @@
tools:visibility="visible" />
</LinearLayout>
</LinearLayout>
-
- <FrameLayout
- android:id="@+id/avatar_container"
- android:layout_width="@dimen/avatar_size"
- android:layout_height="@dimen/avatar_size"
- android:layout_marginEnd="@dimen/message_horizontal"
- android:visibility="gone"
- tools:visibility="visible">
-
- <ImageView
- android:id="@+id/avatar"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:contentDescription="@string/label_avatar"
- tools:src="@tools:sample/avatars" />
- </FrameLayout>
-
- <TextView
- android:id="@+id/time_left"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top"
- android:layout_marginEnd="@dimen/message_horizontal"
- android:textColor="?attr/colorForegroundSecondary"
- android:typeface="monospace"
- tools:text="@sample/messages.json/data/time"
- tools:visibility="gone" />
</LinearLayout>
- <include layout="@layout/widget_chatmessage_daychange" />
-
</LinearLayout>
diff --git a/app/src/main/res/layout/widget_chatmessage_server.xml b/app/src/main/res/layout/widget_chatmessage_server.xml
index 4f370038952cf626eff75ea23de30db1c6da8f95..bd618c9ef642a252b019aecc5ff4b4bd35ec83cc 100644
--- a/app/src/main/res/layout/widget_chatmessage_server.xml
+++ b/app/src/main/res/layout/widget_chatmessage_server.xml
@@ -24,6 +24,8 @@
android:orientation="vertical"
tools:showIn="@layout/chat_messages">
+ <include layout="@layout/widget_chatmessage_daychange" />
+
<LinearLayout
android:id="@+id/message_container"
android:layout_width="match_parent"
@@ -78,6 +80,4 @@
tools:textSize="11.9sp"
tools:visibility="visible" />
</LinearLayout>
-
- <include layout="@layout/widget_chatmessage_daychange" />
</LinearLayout>
diff --git a/app/src/main/res/layout/widget_formatting.xml b/app/src/main/res/layout/widget_formatting.xml
index 8022a18dd10077f2f98bd27657386940cdc99855..95e5940396d20532de65eaf4545bf94017f9cf2b 100644
--- a/app/src/main/res/layout/widget_formatting.xml
+++ b/app/src/main/res/layout/widget_formatting.xml
@@ -27,6 +27,61 @@
android:layout_height="match_parent"
android:padding="2dp">
+ <androidx.appcompat.widget.AppCompatImageButton
+ android:id="@+id/action_format_bold"
+ style="@style/Widget.Button.Format"
+ android:contentDescription="@string/label_bold"
+ app:srcCompat="@drawable/ic_format_bold"
+ app:tint="?colorControlNormal" />
+
+ <Space
+ android:layout_width="2dp"
+ android:layout_height="match_parent" />
+
+ <androidx.appcompat.widget.AppCompatImageButton
+ android:id="@+id/action_format_italic"
+ style="@style/Widget.Button.Format"
+ android:contentDescription="@string/label_italic"
+ app:srcCompat="@drawable/ic_format_italic"
+ app:tint="?colorControlNormal" />
+
+ <Space
+ android:layout_width="2dp"
+ android:layout_height="match_parent" />
+
+ <androidx.appcompat.widget.AppCompatImageButton
+ android:id="@+id/action_format_underline"
+ style="@style/Widget.Button.Format"
+ android:contentDescription="@string/label_underline"
+ app:srcCompat="@drawable/ic_format_underline"
+ app:tint="?colorControlNormal" />
+
+ <Space
+ android:layout_width="2dp"
+ android:layout_height="match_parent" />
+
+ <androidx.appcompat.widget.AppCompatImageButton
+ android:id="@+id/action_format_strikethrough"
+ style="@style/Widget.Button.Format"
+ android:contentDescription="@string/label_strikethrough"
+ app:srcCompat="@drawable/ic_format_strikethrough"
+ app:tint="?colorControlNormal" />
+
+ <Space
+ android:layout_width="2dp"
+ android:layout_height="match_parent" />
+
+ <androidx.appcompat.widget.AppCompatImageButton
+ android:id="@+id/action_format_monospace"
+ style="@style/Widget.Button.Format"
+ android:contentDescription="@string/label_monospace"
+ app:srcCompat="@drawable/ic_format_monospace"
+ app:tint="?colorControlNormal" />
+
+ <Space
+ android:layout_width="2dp"
+ android:layout_height="match_parent" />
+
<FrameLayout
android:layout_width="48dp"
android:layout_height="48dp"
@@ -51,6 +106,10 @@
android:background="?colorForeground" />
</FrameLayout>
+ <Space
+ android:layout_width="2dp"
+ android:layout_height="match_parent" />
+
<FrameLayout
android:layout_width="48dp"
android:layout_height="48dp"
@@ -75,65 +134,6 @@
android:background="?colorBackground" />
</FrameLayout>
- <Space
- android:layout_width="2dp"
- android:layout_height="match_parent" />
-
- <Space
- android:layout_width="2dp"
- android:layout_height="match_parent" />
-
- <Space
- android:layout_width="2dp"
- android:layout_height="match_parent" />
-
- <Space
- android:layout_width="2dp"
- android:layout_height="match_parent" />
-
- <Space
- android:layout_width="2dp"
- android:layout_height="match_parent" />
-
- <Space
- android:layout_width="2dp"
- android:layout_height="match_parent" />
-
- <androidx.appcompat.widget.AppCompatImageButton
- android:id="@+id/action_format_bold"
- style="@style/Widget.Button.Format"
- android:contentDescription="@string/label_bold"
- app:srcCompat="@drawable/ic_format_bold"
- app:tint="?colorControlNormal" />
-
- <androidx.appcompat.widget.AppCompatImageButton
- android:id="@+id/action_format_italic"
- style="@style/Widget.Button.Format"
- android:contentDescription="@string/label_italic"
- app:srcCompat="@drawable/ic_format_italic"
- app:tint="?colorControlNormal" />
-
- <androidx.appcompat.widget.AppCompatImageButton
- android:id="@+id/action_format_underline"
- style="@style/Widget.Button.Format"
- android:contentDescription="@string/label_underline"
- app:srcCompat="@drawable/ic_format_underline"
- app:tint="?colorControlNormal" />
-
- <androidx.appcompat.widget.AppCompatImageButton
- android:id="@+id/action_format_strikethrough"
- style="@style/Widget.Button.Format"
- android:contentDescription="@string/label_strikethrough"
- app:srcCompat="@drawable/ic_format_strikethrough"
- app:tint="?colorControlNormal" />
-
- <androidx.appcompat.widget.AppCompatImageButton
- android:id="@+id/action_format_monospace"
- style="@style/Widget.Button.Format"
- android:contentDescription="@string/label_monospace"
- app:srcCompat="@drawable/ic_format_monospace"
- app:tint="?colorControlNormal" />
-
<Space
android:layout_width="2dp"
android:layout_height="match_parent" />