Migrate scaffold to Jetpack Compose

This commit is contained in:
MM20
2022-04-22 22:50:22 +02:00
parent 0aed749d31
commit b346c69a65
16 changed files with 859 additions and 1156 deletions
@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false">
<de.mm20.launcher2.ui.legacy.view.BatteryChargingView
android:id="@+id/batteryAnimationView"
android:layout_width="48dp"
android:layout_height="96dp"
android:layout_gravity="bottom|center_horizontal" />
<de.mm20.launcher2.ui.launcher.LauncherScaffoldView
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<View
android:id="@+id/activityStartOverlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@color/cardview_background"
android:visibility="invisible" />
</FrameLayout>
@@ -1,60 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:layout_height="match_parent"
tools:layout_width="match_parent"
tools:parentTag="android.widget.FrameLayout">
<androidx.core.widget.NestedScrollView
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
android:scrollbars="none"
tools:context=".activity.LauncherActivity">
<LinearLayout
android:id="@+id/scrollContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical">
<de.mm20.launcher2.ui.launcher.search.SearchView
android:id="@+id/searchContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:visibility="gone" />
<de.mm20.launcher2.ui.launcher.widgets.WidgetsView
android:id="@+id/widgetContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<de.mm20.launcher2.ui.launcher.search.SearchBarView
android:id="@+id/searchBar"
android:layout_width="match_parent"
android:layout_height="112dp"
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true" />
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/editWidgetToolbar"
style="@style/Widget.Material3.Toolbar.Surface"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="4dp"
android:translationY="-56dp"
android:visibility="gone"
app:title="@string/menu_edit_widgets" />
</merge>