Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automotive: Show the hidden Acknowledgements #1166

Merged
merged 2 commits into from
Jul 10, 2023
Merged

Automotive: Show the hidden Acknowledgements #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a433401
Automotive: Show the hidden Acknowledgements
geekygecko Jul 10, 2023
e5c9701
Added a changelog entry.
geekygecko Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
* Bug Fixes:
* Fixed crash that could occur when rearranging shelf items on the full screen player
([#1155](https://github.com/Automattic/pocket-casts-android/pull/1155)).
* Fixed the acknowledgements being hidden in the Automotive about page.
([#1166](https://github.com/Automattic/pocket-casts-android/pull/1166)).

7.42
-----
Expand Down
15 changes: 5 additions & 10 deletions automotive/src/main/res/layout/activity_automotive_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="?attr/primary_ui_04"
tools:context=".AutomotiveSettingsActivity">

<include
android:id="@+id/carHeader"
layout="@layout/car_header"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
layout="@layout/car_header" />

<FrameLayout
android:id="@+id/frameMain"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@id/carHeader"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_height="match_parent" />
</LinearLayout>
5 changes: 2 additions & 3 deletions modules/features/account/src/main/res/layout-land/car_header.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">

Expand All @@ -13,8 +12,8 @@
android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/cancel"
android:scaleType="fitCenter"
android:tint="?attr/primary_icon_01"
android:padding="20dp"
app:tint="?attr/primary_icon_01"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_cancel" />
Expand All @@ -30,4 +29,4 @@
app:layout_constraintStart_toEndOf="@id/btnClose"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="?attr/logo_title_horizontal" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>