Commit bde4194c authored by Janne Koschinski's avatar Janne Koschinski

Fix multiple crashes

parent b70383ce
Pipeline #550 passed with stages
in 38 minutes and 31 seconds
......@@ -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>
......@@ -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"
......
......@@ -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>
......@@ -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>
......
......@@ -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>
......@@ -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>
......@@ -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"
......
......@@ -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>
......@@ -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>
......@@ -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>
......@@ -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"
......
......@@ -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>
......@@ -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"