From ed5e6994935c66b9a77f8a81c0120076225eaf65 Mon Sep 17 00:00:00 2001 From: r-ca Date: Tue, 23 Jan 2024 02:53:53 +0900 Subject: [PATCH] WIP --- .../setting/SettingScanPageFragment.java | 23 ++++----- .../res/layout/fragment_setting_scan_page.xml | 50 ++++++++++++++++--- .../main/res/values/scan_setting_array.xml | 11 ++++ .../src/main/res/values/setting_integers.xml | 6 +++ .../src/main/res/xml/scan_preferences.xml | 29 +++++++++++ shared/ui/src/main/res/values/strings.xml | 8 +++ 6 files changed, 107 insertions(+), 20 deletions(-) create mode 100644 feature/setting/src/main/res/values/scan_setting_array.xml create mode 100644 feature/setting/src/main/res/values/setting_integers.xml create mode 100644 feature/setting/src/main/res/xml/scan_preferences.xml diff --git a/feature/setting/src/main/java/one/nem/lacerta/setting/SettingScanPageFragment.java b/feature/setting/src/main/java/one/nem/lacerta/setting/SettingScanPageFragment.java index 27352225..cad410b9 100644 --- a/feature/setting/src/main/java/one/nem/lacerta/setting/SettingScanPageFragment.java +++ b/feature/setting/src/main/java/one/nem/lacerta/setting/SettingScanPageFragment.java @@ -2,8 +2,12 @@ package one.nem.lacerta.setting; import android.os.Bundle; +import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; +import androidx.preference.PreferenceFragmentCompat; +import android.preference.PreferenceFragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -13,12 +17,17 @@ import android.view.ViewGroup; * Use the {@link SettingScanPageFragment#newInstance} factory method to * create an instance of this fragment. */ -public class SettingScanPageFragment extends Fragment { +public class SettingScanPageFragment extends PreferenceFragmentCompat { public SettingScanPageFragment() { // Required empty public constructor } + @Override + public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) { + addPreferencesFromResource(R.xml.scan_preferences); + } + public static SettingScanPageFragment newInstance() { SettingScanPageFragment fragment = new SettingScanPageFragment(); Bundle args = new Bundle(); @@ -26,16 +35,4 @@ public class SettingScanPageFragment extends Fragment { return fragment; } - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_setting_scan_page, container, false); - } } \ No newline at end of file diff --git a/feature/setting/src/main/res/layout/fragment_setting_scan_page.xml b/feature/setting/src/main/res/layout/fragment_setting_scan_page.xml index 422566e7..916f5abe 100644 --- a/feature/setting/src/main/res/layout/fragment_setting_scan_page.xml +++ b/feature/setting/src/main/res/layout/fragment_setting_scan_page.xml @@ -1,14 +1,50 @@ - + android:background="@color/colorSurface"> - - + android:layout_height="match_parent"> + + + + + + + + + + + + + + \ No newline at end of file diff --git a/feature/setting/src/main/res/values/scan_setting_array.xml b/feature/setting/src/main/res/values/scan_setting_array.xml new file mode 100644 index 00000000..3e4f226f --- /dev/null +++ b/feature/setting/src/main/res/values/scan_setting_array.xml @@ -0,0 +1,11 @@ + + + + 5 + 6 + 7 + 8 + 9 + + + \ No newline at end of file diff --git a/feature/setting/src/main/res/values/setting_integers.xml b/feature/setting/src/main/res/values/setting_integers.xml new file mode 100644 index 00000000..4e21ed5f --- /dev/null +++ b/feature/setting/src/main/res/values/setting_integers.xml @@ -0,0 +1,6 @@ + + + 70 + 5 + 100 + \ No newline at end of file diff --git a/feature/setting/src/main/res/xml/scan_preferences.xml b/feature/setting/src/main/res/xml/scan_preferences.xml new file mode 100644 index 00000000..b5c0cc16 --- /dev/null +++ b/feature/setting/src/main/res/xml/scan_preferences.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/shared/ui/src/main/res/values/strings.xml b/shared/ui/src/main/res/values/strings.xml index d7832d4a..2a35d080 100644 --- a/shared/ui/src/main/res/values/strings.xml +++ b/shared/ui/src/main/res/values/strings.xml @@ -19,6 +19,14 @@ スキャン 画質, 保存先 + 画質 + PNG画質 + PNG画質を設定します. 画質が高いほどファイルサイズが大きくなります. + + 保存先 + 新規ドキュメントのデフォルトタイトル + 新規フォルダのデフォルト名 + 表示 テーマ, フォントサイズ