Merge branch '745-Fix_UI_issue_in_dark_mode' into 'main' (96a00a0f) · Commits · e / os / AccountManager

app/src/main/res/layout/about_translation.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -3,14 +3,14 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		xmlns:tools="http://schemas.android.com/tools"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		app:contentPadding="@dimen/card_padding"
		android:layout_marginTop="8dp"
		android:layout_marginBottom="8dp">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:padding="@dimen/card_padding"
		android:background="@color/foregroundColor"
		android:orientation="vertical">

		<TextView

app/src/main/res/layout/account_collections.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:padding="@dimen/card_padding"
		android:background="@color/foregroundColor"
		android:orientation="horizontal">
		<TextView
		android:id="@+id/permissionsText"
		@@ -52,6 +53,7 @@
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		style="@style/Widget.MaterialComponents.Button.TextButton"
		android:textColor="@color/primaryTextColor"
		android:text="@string/account_permissions_action" />
		</androidx.constraintlayout.widget.ConstraintLayout>
		</com.google.android.material.card.MaterialCardView>

app/src/main/res/layout/account_list.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/Widget.MaterialComponents.Button.TextButton"
		android:textColor="@color/primaryTextColor"
		android:text="Manage connections" />

		</LinearLayout>
		@@ -63,6 +64,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/Widget.MaterialComponents.Button.TextButton"
		android:textColor="@color/primaryTextColor"
		android:text="Manage storage" />

		</LinearLayout>

app/src/main/res/layout/activity_add_webdav_mount.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="end"
		android:textColor="@color/primaryTextColor"
		android:text="@string/webdav_add_mount_add" />

		</androidx.cardview.widget.CardView>

app/src/main/res/layout/activity_debug_info.xml

+15 −5

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@color/backgroundColor"
		android:layout_margin="@dimen/activity_margin"
		android:orientation="vertical">

		@@ -42,7 +43,8 @@
		<androidx.constraintlayout.widget.ConstraintLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="@dimen/card_padding">
		android:background="@color/foregroundColor"
		android:paddingBottom="@dimen/card_padding">

		<androidx.constraintlayout.widget.Guideline
		android:id="@+id/zipStart"
		@@ -124,6 +126,7 @@
		app:layout_constraintBottom_toBottomOf="parent"
		style="@style/Widget.MaterialComponents.Button.TextButton"
		android:enabled="@{model.debugInfo != null && !model.zipProgress}"
		android:textColor="@color/primaryTextColor"
		android:text="@string/debug_info_archive_share" />

		</androidx.constraintlayout.widget.ConstraintLayout>
		@@ -139,7 +142,8 @@
		<androidx.constraintlayout.widget.ConstraintLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="@dimen/card_padding"
		android:paddingBottom="@dimen/card_padding"
		android:background="@color/foregroundColor"
		android:orientation="vertical">

		<androidx.constraintlayout.widget.Guideline
		@@ -224,6 +228,7 @@
		app:layout_constraintLeft_toLeftOf="@id/causeStart"
		app:layout_constraintBottom_toBottomOf="parent"
		style="@style/Widget.MaterialComponents.Button.TextButton"
		android:textColor="@color/primaryTextColor"
		android:text="@string/debug_info_view_details"/>

		</androidx.constraintlayout.widget.ConstraintLayout>
		@@ -239,7 +244,8 @@
		<androidx.constraintlayout.widget.ConstraintLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="@dimen/card_padding"
		android:paddingBottom="@dimen/card_padding"
		android:background="@color/foregroundColor"
		android:orientation="vertical">

		<androidx.constraintlayout.widget.Guideline
		@@ -312,6 +318,7 @@
		app:layout_constraintLeft_toLeftOf="@id/debugInfoStart"
		app:layout_constraintBottom_toBottomOf="parent"
		style="@style/Widget.MaterialComponents.Button.TextButton"
		android:textColor="@color/primaryTextColor"
		android:text="@string/debug_info_view_details"/>

		</androidx.constraintlayout.widget.ConstraintLayout>
		@@ -327,7 +334,8 @@
		<androidx.constraintlayout.widget.ConstraintLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_margin="@dimen/card_padding">
		android:background="@color/foregroundColor"
		android:padding="@dimen/card_padding">

		<ImageView
		android:id="@+id/resIcon"
		@@ -420,7 +428,8 @@
		<androidx.constraintlayout.widget.ConstraintLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_margin="@dimen/card_padding">
		android:background="@color/foregroundColor"
		android:padding="@dimen/card_padding">

		<ImageView
		android:id="@+id/logsIcon"
		@@ -464,6 +473,7 @@
		app:layout_constraintLeft_toLeftOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		style="@style/Widget.MaterialComponents.Button.TextButton"
		android:textColor="@color/primaryTextColor"
		android:text="@string/debug_info_logs_view"/>

		</androidx.constraintlayout.widget.ConstraintLayout>