WIP

テキストリソースを抽出 1

app/build.gradle

@@ -59,30 +59,6 @@ dependencies {
     androidTestImplementation libs.androidx.test.ext.junit
     androidTestImplementation libs.androidx.test.espresso.core
 
-    // 内部モジュール
-    // Feature
-    implementation project(':feature:home')
-    implementation project(':feature:search')
-    implementation project(':feature:library')
-    implementation project(':feature:scan')
-    implementation project(':feature:debug')  // デバッグメニュー
-
-//    // Component
-//    implementation project(':component:common')
-//    implementation project(':component:scanner')
-//    implementation project(':component:viewer')
-
-//    // Data
-//    implementation project(':data:repository')
-//
-//    // Source
-//    implementation project(':data:source:database')
-//    implementation project(':data:source:preference')
-//
-    implementation project(':data')
-
-    implementation project(':shared:ui')
-
     // Hilt (DI)
     implementation libs.com.google.dagger.hilt.android
     annotationProcessor libs.com.google.dagger.hilt.compiler
@@ -92,4 +68,13 @@ dependencies {
     implementation libs.navigation.ui
     implementation libs.navigation.dynamic.features.fragment
 
+    // Feature
+    implementation project(':feature:home')
+    implementation project(':feature:search')
+    implementation project(':feature:library')
+    implementation project(':feature:scan')
+    implementation project(':feature:debug')  // デバッグメニュー
+
+    implementation project(':data')
+    implementation project(':shared:ui')
 }

app/src/main/java/one/nem/lacerta/LacertaApplication.java

@@ -1,6 +1,7 @@
 package one.nem.lacerta;
 
 import android.app.Application;
+import android.util.Log;
 
 import com.google.android.material.color.DynamicColors;
 
@@ -12,8 +13,12 @@ public class LacertaApplication extends Application {
     public void onCreate() {
         super.onCreate();
 
-        // DynamicColorを有効化
-        DynamicColors.applyToActivitiesIfAvailable(this);
+        if (DynamicColors.isDynamicColorAvailable()) {
+            Log.d("DynamicColors", "DynamicColors is available. Applying to activities...");
+            DynamicColors.applyToActivitiesIfAvailable(this);
+        } else {
+            Log.d("DynamicColors", "DynamicColors is not available.");
+        }
 
     }
 

app/src/main/java/one/nem/lacerta/MainActivity.java

@@ -1,7 +1,10 @@
 package one.nem.lacerta;
 
+import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.FragmentManager;
 import androidx.navigation.NavController;
 import androidx.navigation.fragment.NavHostFragment;
@@ -9,11 +12,15 @@ import androidx.navigation.ui.NavigationUI;
 
 import android.graphics.Color;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.Gravity;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
-
-
+import com.google.android.material.shape.CornerFamily;
+import com.google.android.material.shape.MaterialShapeDrawable;
+import com.google.android.material.shape.ShapeAppearanceModel;
 
 
 import dagger.hilt.android.AndroidEntryPoint;
@@ -27,20 +34,56 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        // Debug
-        FragmentManager supportFragmentManager = getSupportFragmentManager();
-
-        NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
-        NavController navController = navHostFragment.getNavController();
-        BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
-
-        NavigationUI.setupWithNavController(bottomNavigationView, navController);
-
-        Toast.makeText(this, "testMessage", Toast.LENGTH_SHORT).show();
+        // Init navigation
+        try {
+            FragmentManager supportFragmentManager = getSupportFragmentManager();
+            NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment);
+            assert navHostFragment != null;
+            NavController navController = navHostFragment.getNavController();
+            BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav);
+            NavigationUI.setupWithNavController(bottomNavigationView, navController);
+        }
+        catch (Exception e) {
+            Log.e("Init", "Failed to init navigation");
+            Log.e("Init", "Searchable Error code: " + "894b5941-3bc0-46fe-b752-0dbc88be29a8");
+            Toast.makeText(this, "Failed to init navigation", Toast.LENGTH_LONG).show();
+            finish(); // Exit app
+        }
 
+        // Set navigation bar color
         getWindow().setNavigationBarColor(ContextCompat.getColor(this, one.nem.lacerta.shared.ui.R.color.colorSurfaceVariant));
 
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
 
+//        // Create a new TextView
+//        TextView toolbarTitle = new TextView(this);
+//        // Set the text and center it in the TextView
+//        toolbarTitle.setText("App Name");
+//        toolbarTitle.setTextColor(Color.WHITE);
+//        toolbarTitle.setTextSize(20);
+//        toolbarTitle.setLayoutParams(new Toolbar.LayoutParams(Toolbar.LayoutParams.WRAP_CONTENT,
+//                Toolbar.LayoutParams.WRAP_CONTENT, Gravity.CENTER_HORIZONTAL));
+//
+//        // Set the TextView as the title
+//        toolbar.addView(toolbarTitle);
+
+        float radius = getResources().getDimension(one.nem.lacerta.shared.ui.R.dimen.toolbar_corner_radius);
+
+        MaterialShapeDrawable materialShapeDrawable = (MaterialShapeDrawable)toolbar.getBackground();
+        materialShapeDrawable.setShapeAppearanceModel(materialShapeDrawable.getShapeAppearanceModel()
+                .toBuilder()
+                .setAllCorners(CornerFamily.ROUNDED,radius)
+                .build());
+        // Set the MaterialShapeDrawable as the background of the Toolbar
+
+        DrawerLayout drawer = findViewById(R.id.drawer_layout);
+        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
+                this, drawer, toolbar, one.nem.lacerta.shared.ui.R.string.placeholder, one.nem.lacerta.shared.ui.R.string.placeholder);
+        drawer.addDrawerListener(toggle);
+        toggle.syncState();
+
+        // Set the app name in the middle of the toolbar
+        getSupportActionBar().setTitle("App Name");
     }
-
 }

app/src/main/res/layout/activity_main.xml

@@ -1,32 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout 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"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:theme="@style/Theme.Lacerta"
     tools:context=".MainActivity">
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/nav_host_fragment"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:defaultNavHost="true"
-        app:layout_constraintBottom_toTopOf="@+id/bottom_nav"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navGraph="@navigation/main_nav"
-        tools:layout="@layout/fragment_debug_menu_container" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bottom_nav"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:menu="@menu/bottom_nav_menu"/>
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?attr/colorSecondaryContainer"
+                app:layout_scrollFlags="scroll|enterAlways"
+                android:layout_margin="8dp"
+                app:titleCentered="true" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/nav_host_fragment"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:defaultNavHost="true"
+            app:layout_constraintBottom_toTopOf="@+id/bottom_nav"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/app_bar_layout"
+            app:navGraph="@navigation/main_nav"
+            tools:layout="@layout/fragment_debug_menu_container" />
+
+        <com.google.android.material.bottomnavigation.BottomNavigationView
+            android:id="@+id/bottom_nav"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:menu="@menu/bottom_nav_menu"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <!-- NavigationView for the navigation drawer -->
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        app:menu="@menu/drawer_menu" />
+
+</androidx.drawerlayout.widget.DrawerLayout>

app/src/main/res/menu/bottom_nav_menu.xml

@@ -4,22 +4,21 @@
     <item
         android:id="@id/feature_home_navigation"
         android:icon="@drawable/home_24px"
-        android:title="Home"/>
-
-    <item
-        android:id="@id/feature_library_navigation"
-        android:icon="@drawable/folder_24px"
-        android:title="Library"/>
+        android:title="@string/home_title"/>
 
     <item
         android:id="@id/feature_search_navigation"
         android:icon="@drawable/search_24px"
-        android:title="Search"/>
+        android:title="@string/search_title"/>
+
+    <item
+        android:id="@id/feature_library_navigation"
+        android:icon="@drawable/folder_24px"
+        android:title="@string/library_title"/>
 
     <item
         android:id="@id/feature_debug_navigation"
         android:icon="@drawable/developer_mode_24px"
-        android:title="Debug menu"/>
-
+        android:title="@string/debug_menu_title"/>
 
 </menu>

app/src/main/res/menu/drawer_menu.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/nav_home"
+        android:icon="@drawable/developer_mode_24px"
+        android:title="@string/placeholder" />
+</menu>

feature/home/src/main/res/layout/fragment_home_top.xml

@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".HomeTopFragment"
-    tools:ignore="ExtraText">
+    tools:ignore="ExtraText"
+    android:background="@color/colorSurface">
 
 
     <!-- TODO: Update blank fragment layout -->

shared/ui/src/main/res/values/dimens.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="toolbar_corner_radius">32dp</dimen>
+</resources>

shared/ui/src/main/res/values/strings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- home -->
+    <string name="home_title">ホーム</string>
+
+    <!-- search -->
+    <string name="search_title">検索</string>
+
+    <!-- library -->
+    <string name="library_title">ライブラリ</string>
+
+    <!-- debug -->
+    <string name="debug_menu_title">デバッグメニュー</string>
+
+    <!-- common -->
+
+    <!-- for placeholder -->
+    <string name="placeholder">Placeholder(TODO: Replace)</string>
+</resources>

shared/ui/src/main/res/values/themes_global.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>