Merge remote-tracking branch 'upstream/master'

This commit is contained in:
sk
2023-01-26 00:56:05 +01:00
8 changed files with 511 additions and 353 deletions

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<me.grishka.appkit.views.FragmentRootLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -11,6 +11,7 @@
android:layout_weight="1"/>
<LinearLayout
android:background="@drawable/bg_onboarding_panel"
android:id="@+id/button_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -41,4 +42,4 @@
</LinearLayout>
</me.grishka.appkit.views.FragmentRootLinearLayout>
</LinearLayout>