This commit is contained in:
r-ca 2023-12-17 21:58:07 +09:00
parent eff8e2037a
commit ffe823698c
No known key found for this signature in database
GPG Key ID: 6A72911AC73464A9
6 changed files with 37 additions and 6 deletions

View File

@ -4,10 +4,10 @@
<selectionStates> <selectionStates>
<SelectionState runConfigName="app"> <SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" /> <option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2023-12-11T06:35:18.488085Z"> <DropdownSelection timestamp="2023-12-17T12:25:49.321339471Z">
<Target type="DEFAULT_BOOT"> <Target type="DEFAULT_BOOT">
<handle> <handle>
<DeviceId pluginId="LocalEmulator" identifier="path=/Users/rca/.android/avd/Pixel_6_API_28_Trident_.avd" /> <DeviceId pluginId="PhysicalDevice" identifier="serial=99081FFAZ0015R" />
</handle> </handle>
</Target> </Target>
</DropdownSelection> </DropdownSelection>

View File

@ -11,6 +11,8 @@ public class LacertaApplication extends Application {
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
// DynamicColorを有効化
DynamicColors.applyToActivitiesIfAvailable(this); DynamicColors.applyToActivitiesIfAvailable(this);
} }
} }

View File

@ -24,6 +24,7 @@
android:id="@+id/bottom_nav" android:id="@+id/bottom_nav"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/Theme.Lacerta"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

View File

@ -6,9 +6,9 @@
tools:context=".DebugMenuMetaDataFragment"> tools:context=".DebugMenuMetaDataFragment">
<!-- TODO: Update blank fragment layout --> <!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout> </FrameLayout>

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- TODO: ダーク対応させる -->
<color name="colorPrimary">@color/material_dynamic_primary40</color> <color name="colorPrimary">@color/material_dynamic_primary40</color>
<color name="colorOnPrimary">#FFFFFF</color> <color name="colorOnPrimary">#FFFFFF</color>
<color name="colorPrimaryContainer">@color/material_dynamic_primary90</color> <color name="colorPrimaryContainer">@color/material_dynamic_primary90</color>

View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">@color/material_dynamic_primary40</color>
<color name="colorOnPrimary">#FFFFFF</color>
<color name="colorPrimaryContainer">@color/material_dynamic_primary90</color>
<color name="colorOnPrimaryContainer">@color/material_dynamic_primary10</color>
<color name="colorPrimaryInverse">@color/material_dynamic_primary80</color>
<color name="colorSecondary">@color/material_dynamic_secondary40</color>
<color name="colorOnSecondary">#FFFFFF</color>
<color name="colorSecondaryContainer">@color/material_dynamic_secondary90</color>
<color name="colorOnSecondaryContainer">@color/material_dynamic_secondary10</color>
<color name="colorTertiary">@color/material_dynamic_tertiary40</color>
<color name="colorOnTertiary">#FFFFFF</color>
<color name="colorTertiaryContainer">@color/material_dynamic_tertiary90</color>
<color name="colorOnTertiaryContainer">@color/material_dynamic_tertiary10</color>
<color name="colorError">#B3261E</color>
<color name="colorOnError">#FFFFFF</color>
<color name="colorErrorContainer">#F9DEDC</color>
<color name="colorOnErrorContainer">#410E0B</color>
<color name="colorOutline">@color/material_dynamic_neutral_variant50</color>
<color name="colorOnBackground">@color/material_dynamic_neutral10</color>
<color name="colorSurface">@color/material_dynamic_neutral95</color>
<color name="colorOnSurface">@color/material_dynamic_neutral10</color>
<color name="colorSurfaceVariant">@color/material_dynamic_neutral_variant90</color>
<color name="colorOnSurfaceVariant">@color/material_dynamic_neutral_variant30</color>
<color name="colorSurfaceInverse">@color/material_dynamic_neutral20</color>
</resources>