mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix inset issues in landscape.

fork-5.53.8
Greyson Parrelli 2021-01-24 02:22:09 -05:00
rodzic f42ec5318f
commit d8060b3041
4 zmienionych plików z 36 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/components/InsetAwareConstraintLayout.java
Wyświetl plik

@ -33,6 +33,8 @@ public class InsetAwareConstraintLayout extends ConstraintLayout {
protected boolean fitSystemWindows(Rect insets) {
Guideline statusBarGuideline = findViewById(R.id.status_bar_guideline);
Guideline navigationBarGuideline = findViewById(R.id.navigation_bar_guideline);
Guideline parentStartGuideline = findViewById(R.id.parent_start_guideline);
Guideline parentEndGuideline = findViewById(R.id.parent_end_guideline);
if (statusBarGuideline != null) {
statusBarGuideline.setGuidelineBegin(insets.top);
@ -42,6 +44,14 @@ public class InsetAwareConstraintLayout extends ConstraintLayout {
navigationBarGuideline.setGuidelineEnd(insets.bottom);
}
if (parentStartGuideline != null) {
parentStartGuideline.setGuidelineBegin(insets.left);
}
if (parentEndGuideline != null) {
parentEndGuideline.setGuidelineEnd(insets.right);
}
return true;
}
}

15
app/src/main/res/layout/conversation_activity.xml
Wyświetl plik

@ -25,10 +25,11 @@
tools:visibility="visible" />
<com.google.android.material.appbar.AppBarLayout
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/status_bar_guideline"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"
app:layout_constraintTop_toTopOf="@id/status_bar_guideline">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
@ -76,10 +77,12 @@
<org.thoughtcrime.securesms.components.InputAwareLayout
android:id="@+id/layout_container"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="@id/status_bar_guideline"
app:layout_constraintBottom_toBottomOf="@id/navigation_bar_guideline">
app:layout_constraintBottom_toBottomOf="@id/navigation_bar_guideline"
app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
app:layout_constraintEnd_toEndOf="@id/parent_end_guideline">
<LinearLayout
android:id="@+id/conversation_container"

4
app/src/main/res/layout/conversation_reaction_scrubber.xml
Wyświetl plik

@ -3,10 +3,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/conversation_reaction_scrubber"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="@+id/status_bar_guideline"
app:layout_constraintBottom_toBottomOf="@+id/navigation_bar_guideline"
app:layout_constraintStart_toStartOf="@+id/parent_start_guideline"
app:layout_constraintEnd_toEndOf="@+id/parent_end_guideline"
android:elevation="1000dp"
android:visibility="gone"
tools:visibility="visible">

14
app/src/main/res/layout/system_ui_guidelines.xml
Wyświetl plik

@ -14,4 +14,18 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
tools:layout_constraintGuide_end="48dp" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/parent_start_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:layout_constraintGuide_begin="5dp" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/parent_end_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:layout_constraintGuide_end="5dp" />
</merge>