Support landscape mode for Primary detail Activity template
This CL doesn't change the dimens for larger that w1240 dp because
this template already handles it with two panes.
Bug: 179206264
Test: TemplateTest, manually created PrimaryDetail Activity
Change-Id: I2f5f787977ffa27da24a3b90086aca0e8861c944
diff --git a/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/primaryDetailFlowRecipe.kt b/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/primaryDetailFlowRecipe.kt
index 12d4257..39c2dd9 100644
--- a/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/primaryDetailFlowRecipe.kt
+++ b/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/primaryDetailFlowRecipe.kt
@@ -34,6 +34,8 @@
import com.android.tools.idea.wizard.template.impl.activities.primaryDetailFlow.res.layout.fragmentItemListXml
import com.android.tools.idea.wizard.template.impl.activities.primaryDetailFlow.res.layout.itemListContentXml
import com.android.tools.idea.wizard.template.impl.activities.primaryDetailFlow.res.values.dimensXml
+import com.android.tools.idea.wizard.template.impl.activities.primaryDetailFlow.res.values_land.dimensXml as dimensXmlLand
+import com.android.tools.idea.wizard.template.impl.activities.primaryDetailFlow.res.values_w600dp.dimensXml as dimensXmlW600dp
import com.android.tools.idea.wizard.template.impl.activities.primaryDetailFlow.res.values.stringsXml
import com.android.tools.idea.wizard.template.impl.activities.primaryDetailFlow.src.app_package.contentDetailFragmentJava
import com.android.tools.idea.wizard.template.impl.activities.primaryDetailFlow.src.app_package.contentDetailFragmentKt
@@ -103,6 +105,8 @@
}
mergeXml(dimensXml(), resOut.resolve("values/dimens.xml"))
+ mergeXml(dimensXmlLand(), resOut.resolve("values-land/dimens.xml"))
+ mergeXml(dimensXmlW600dp(), resOut.resolve("values-w600dp/dimens.xml"))
generateNoActionBarStyles(moduleData.baseFeature?.resDir, resOut, moduleData.themesData)
// navHostFragmentId needs to be unique, thus appending detailNameLayout since it's
diff --git a/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/layout/fragmentItemDetailXml.kt b/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/layout/fragmentItemDetailXml.kt
index 1ddd12f..9783e85 100644
--- a/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/layout/fragmentItemDetailXml.kt
+++ b/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/layout/fragmentItemDetailXml.kt
@@ -71,7 +71,10 @@
style="?android:attr/textAppearanceLarge"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:padding="16dp"
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp"
+ android:paddingStart="@dimen/container_horizontal_margin"
+ android:paddingEnd="@dimen/container_horizontal_margin"
android:textIsSelectable="true"
tools:context="${packageName}.${detailName}Fragment" />
@@ -82,7 +85,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start"
- android:layout_margin="@dimen/fab_margin"
+ android:layout_marginBottom="16dp"
+ android:layout_marginEnd="@dimen/fab_margin"
app:srcCompat="@android:drawable/stat_notify_chat"
app:layout_anchor="@+id/${detailNameLayout}_scroll_view"
app:layout_anchorGravity="top|end" />
diff --git a/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/layout/fragmentItemListXml.kt b/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/layout/fragmentItemListXml.kt
index 15b285d..2920739 100644
--- a/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/layout/fragmentItemListXml.kt
+++ b/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/layout/fragmentItemListXml.kt
@@ -34,7 +34,9 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/${itemListLayout}_container"
android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ android:layout_height="match_parent"
+ android:layout_marginStart="@dimen/container_horizontal_margin"
+ android:layout_marginEnd="@dimen/container_horizontal_margin">
<${getMaterialComponentName("android.support.v7.widget.RecyclerView", useAndroidX)}
android:id="@+id/${itemListLayout}"
diff --git a/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/values/dimensXml.kt b/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/values/dimensXml.kt
index 86f23b9..4f2851e 100644
--- a/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/values/dimensXml.kt
+++ b/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/values/dimensXml.kt
@@ -25,5 +25,6 @@
<dimen name="app_bar_height">200dp</dimen>
<dimen name="text_margin">16dp</dimen>
<dimen name="container_margin">8dp</dimen>
+ <dimen name="container_horizontal_margin">16dp</dimen>
</resources>
"""
diff --git a/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/values_land/dimensXml.kt b/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/values_land/dimensXml.kt
new file mode 100644
index 0000000..80ab565
--- /dev/null
+++ b/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/values_land/dimensXml.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.tools.idea.wizard.template.impl.activities.primaryDetailFlow.res.values_land
+
+
+fun dimensXml() = """
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <dimen name="fab_margin">48dp</dimen>
+ <dimen name="container_horizontal_margin">48dp</dimen>
+</resources>
+"""
diff --git a/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/values_w600dp/dimensXml.kt b/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/values_w600dp/dimensXml.kt
new file mode 100644
index 0000000..496a562
--- /dev/null
+++ b/wizard/template-impl/src/com/android/tools/idea/wizard/template/impl/activities/primaryDetailFlow/res/values_w600dp/dimensXml.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.tools.idea.wizard.template.impl.activities.primaryDetailFlow.res.values_w600dp
+
+
+fun dimensXml() = """
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <dimen name="fab_margin">48dp</dimen>
+ <dimen name="container_horizontal_margin">48dp</dimen>
+</resources>
+"""
