レイアウトマージン設定

This reverts commit ba4ff5652e.

.github/PULL_REQUEST_TEMPLATE/general.md

@@ -1,18 +0,0 @@
-# 概要
-<!-- PRの概要 -->
-
-# 関連Issue
-- #000 <!-- 関連するIssueを指定(なければ省略可) -->
-
-# 詳細
-<!-- 詳細 -->
-
-# 影響箇所
-<!-- 予想される影響箇所 -->
-
-# チェック
-<!-- 参考用, 全てにチェックがついている必要があるわけではありません -->
-- [ ] 機能として完成している
-  - [ ] WIP(Work in progress: 作業中)
-- [ ] 正常にビルド/起動ができる
-- [ ] 既存の機能を壊していない

.idea/deploymentTargetDropDown.xml

@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="ZY227DCBHN" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-12-21T04:53:14.729902700Z" />
+    <value>
+      <entry key="app">
+        <State />
+      </entry>
+    </value>
   </component>
 </project>

.idea/gradle.xml

@@ -4,7 +4,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="jbr-17" />
         <option name="modules">

.idea/misc.xml

@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/AndroidManifest.xml

@@ -7,12 +7,6 @@
         android:required="false" />
     <uses-permission android:name="android.permission.CAMERA" />
 
-    <queries>
-        <intent>
-            <action android:name="android.media.action.IMAGE_CAPTURE" />
-        </intent>
-    </queries>
-
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"

feature/library/build.gradle

@@ -29,8 +29,6 @@ dependencies {
 
     implementation libs.androidx.appcompat
     implementation libs.com.google.android.material
-    implementation 'androidx.navigation:navigation-fragment:2.7.5'
-    implementation 'androidx.navigation:navigation-ui:2.7.5'
     testImplementation libs.junit
     androidTestImplementation libs.androidx.test.ext.junit
     androidTestImplementation libs.androidx.test.espresso.core
@@ -40,11 +38,4 @@ dependencies {
     implementation libs.navigation.ui
     implementation libs.navigation.dynamic.features.fragment
 
-    // Hilt (DI)
-    implementation libs.com.google.dagger.hilt.android
-    annotationProcessor libs.com.google.dagger.hilt.compiler
-
-    implementation project(':shared:ui')
-
-
 }

feature/library/src/main/java/one/nem/lacerta/feature/library/DocumentAdapter.java

@@ -1,46 +0,0 @@
-package one.nem.lacerta.feature.library;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.List;
-
-public class DocumentAdapter extends RecyclerView.Adapter<DocumentAdapter.DocumentViewHolder> {
-
-    private List<String> documentList;
-
-    public DocumentAdapter(List<String> documentList) {
-        this.documentList = documentList;
-    }
-
-    @NonNull
-    @Override
-    public DocumentViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_library_menu, parent, false);
-        return new DocumentViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull DocumentViewHolder holder, int position) {
-        holder.title.setText(documentList.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return documentList.size();
-    }
-
-    class DocumentViewHolder extends RecyclerView.ViewHolder {
-        TextView title;
-
-        DocumentViewHolder(View itemView) {
-            super(itemView);
-            title = itemView.findViewById(R.id.debug_menu_item_title);
-        }
-    }
-}

feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryArchiveFragment.java

@@ -1,35 +0,0 @@
-package one.nem.lacerta.feature.library;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-// LibraryArchiveFragment.java
-public class LibraryArchiveFragment extends AppCompatActivity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.fragment_library_top);
-
-        // ここに入力された内容を表示する機能
-        TextView textView = findViewById(R.id.document_list);
-
-        textView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                // 文字をタップしたときの処理
-
-                // 移動先のアクティビティを指定
-                Intent intent = new Intent(LibraryArchiveFragment.this, LibraryDocFragment.class);
-
-                // データを付加する
-                intent.putExtra("key_name", "value_data");
-
-                startActivity(intent);
-            }
-        });
-    }
-}

feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryDocFragment.java

@@ -1,50 +0,0 @@
-package one.nem.lacerta.feature.library;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.fragment.app.Fragment;
-
-public class LibraryDocFragment extends Fragment {
-
-    private TextView textView;  // フィールドとして TextView を定義
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_library_file, container, false);
-
-        textView = view.findViewById(R.id.textView);
-
-        return view;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // フラグメントに渡されたデータを取得
-        if (getArguments() != null) {
-            String receivedData = getArguments().getString("key_name");
-
-            // onCreateView メソッドで取得した TextView にデータをセットする
-            if (textView != null) {
-                textView.setText(receivedData);
-            }
-        }
-    }
-
-    // Factory method for creating a new instance of the fragment
-    public static LibraryDocFragment newInstance(String data) {
-        LibraryDocFragment fragment = new LibraryDocFragment();
-
-        // フラグメントにデータを渡す
-        Bundle args = new Bundle();
-        args.putString("key_name", data);
-        fragment.setArguments(args);
-
-        return fragment;
-    }
-}

feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryTopFragment.java

@@ -2,20 +2,11 @@ package one.nem.lacerta.feature.library;
 
 import android.os.Bundle;
 
-import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -64,28 +55,10 @@ public class LibraryTopFragment extends Fragment {
         }
     }
 
-
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        View view = inflater.inflate(R.layout.fragment_library_top, container, false);
-
-        // Use view.findViewById instead of findViewById
-        RecyclerView documentRecyclerView = view.findViewById(R.id.document_list);
-
-        LinearLayoutManager layoutManager = new LinearLayoutManager(getContext());
-        documentRecyclerView.setLayoutManager(layoutManager);
-
-        List<String> documentList = new ArrayList<>();
-        documentList.add("Document A");
-        documentList.add("Document B");
-        documentList.add("Document C");
-
-// Create and set the adapter
-        DocumentAdapter adapter = new DocumentAdapter(documentList);
-        documentRecyclerView.setAdapter(adapter);
-
-// Use a LinearLayoutManager to specify the layout
-        return view;
+        return inflater.inflate(R.layout.fragment_library_top, container, false);
     }
-}
+}

feature/library/src/main/res/layout/fragment_library_file.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="16dp">
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textSize="16sp"
-        android:layout_marginEnd="8dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

feature/library/src/main/res/layout/fragment_library_top.xml

@@ -1,32 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:theme="@style/Theme.Lacerta"
     tools:context=".LibraryTopFragment">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/tool_bar"
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorPrimaryContainer"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="?attr/actionBarTheme"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:title="Library"
-        app:titleTextColor="@color/colorOnPrimaryContainer" />
+        android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/document_list"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tool_bar" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>

feature/library/src/main/res/layout/list_item_library_menu.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="16dp">
-
-    <TextView
-        android:id="@+id/debug_menu_item_title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textSize="16sp"
-        android:layout_marginEnd="8dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/debug_menu_item_description"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/debug_menu_item_title" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

feature/library/src/main/res/values/strings.xml

@@ -1,3 +1,4 @@
 <resources>
-    <string name="app_name">Library</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>

utils/src/main/java/one/nem/lacerta/utils/LacertaLogger.java

@@ -1,7 +1,5 @@
 package one.nem.lacerta.utils;
 
-import one.nem.lacerta.utils.model.KeyValueLog;
-
 public interface LacertaLogger {
 
     void info(String tag, String message);
@@ -11,7 +9,4 @@ public interface LacertaLogger {
     void trace(String tag, String message);
     void fatal(String tag, String message);
 
-    String buildKVMessage(KeyValueLog... logs);
-    // With name
-    String buildKVMessage(String name, KeyValueLog... logs);
 }

utils/src/main/java/one/nem/lacerta/utils/impl/LacertaLoggerImpl.java

@@ -5,8 +5,6 @@ import android.util.Log;
 import javax.inject.Inject;
 
 import one.nem.lacerta.utils.LacertaLogger;
-import one.nem.lacerta.utils.model.KeyValueLog;
-
 public class LacertaLoggerImpl implements LacertaLogger{
 
     @Inject
@@ -42,30 +40,4 @@ public class LacertaLoggerImpl implements LacertaLogger{
     public void fatal(String tag, String message) {
         Log.wtf(tag, message);
     }
-
-    @Override
-    public String buildKVMessage(KeyValueLog... logs) {
-        StringBuilder builder = new StringBuilder();
-        for (KeyValueLog log : logs) {
-            builder.append(log.getKey());
-            builder.append(": ");
-            builder.append(log.getValue());
-            builder.append("\n");
-        }
-        return builder.toString();
-    }
-
-    @Override
-    public String buildKVMessage(String name, KeyValueLog... logs) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(name);
-        builder.append("\n");
-        for (KeyValueLog log : logs) {
-            builder.append(log.getKey());
-            builder.append(": ");
-            builder.append(log.getValue());
-            builder.append("\n");
-        }
-        return builder.toString();
-    }
 }

utils/src/main/java/one/nem/lacerta/utils/model/KeyValueLog.java

@@ -1,31 +0,0 @@
-package one.nem.lacerta.utils.model;
-
-public class KeyValueLog {
-
-    String key;
-    String value;
-
-    public KeyValueLog(String key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    // Getter
-    public String getKey() {
-        return key;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    // Setter
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-}