diff --git a/.idea/misc.xml b/.idea/misc.xml index d80f919..8de8a6e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,6 +3,17 @@ - - - diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java index f17960f..a564b35 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java @@ -164,30 +164,7 @@ @Override public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - Button appButton = view.findViewById(R.id.Paint_button); - Integer uid = 1; - String token = "abc0"; - //編集ボタン - Button editButton = view.findViewById(R.id.Edit_button); - - appButton.setOnClickListener(v -> { - Acanthus acanthus = (Acanthus) getActivity().getApplication(); - //Integer uid = acanthus.getPreferenceUid(); - String name = ((EditText)view.findViewById(R.id.AnimationName)).getText().toString(); - //String token = acanthus.getPreferenceToken(); - //Integer aid = editViewModel.startWorkEdit(uid, name, token); - editViewModel.startWorkEdit(uid, name, token); - }); - - editButton.setOnClickListener(v -> { - Acanthus acanthus = (Acanthus) getActivity().getApplication(); - //dummy--------- - Integer aid = 1111; - //-------------- - acanthus.setAid(aid); - transitionPaintActivity(); - }); } //----------------------------------------------------------------- diff --git a/app/src/main/res/drawable/flame_edit_list.xml b/app/src/main/res/drawable/flame_edit_list.xml new file mode 100644 index 0000000..befbb0b --- /dev/null +++ b/app/src/main/res/drawable/flame_edit_list.xml @@ -0,0 +1,22 @@ + + + + android:shape="rectangle"> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/flame_home_list.xml b/app/src/main/res/drawable/flame_home_list.xml new file mode 100644 index 0000000..9e063bf --- /dev/null +++ b/app/src/main/res/drawable/flame_home_list.xml @@ -0,0 +1,17 @@ + + + + android:shape="rectangle" > + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/flame_style.xml b/app/src/main/res/drawable/flame_style.xml deleted file mode 100644 index 2fffc39..0000000 --- a/app/src/main/res/drawable/flame_style.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - android:shape="rectangle"> - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/hamburger.jpg b/app/src/main/res/drawable/hamburger.jpg new file mode 100644 index 0000000..d50850d --- /dev/null +++ b/app/src/main/res/drawable/hamburger.jpg Binary files differ diff --git a/app/src/main/res/drawable/ic_baseline_person.xml b/app/src/main/res/drawable/ic_baseline_person.xml new file mode 100644 index 0000000..6bdced2 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_person.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/note.png b/app/src/main/res/drawable/note.png new file mode 100644 index 0000000..60c647d --- /dev/null +++ b/app/src/main/res/drawable/note.png Binary files differ diff --git a/app/src/main/res/drawable/yellow_gabyou.png b/app/src/main/res/drawable/yellow_gabyou.png new file mode 100644 index 0000000..32cebdc --- /dev/null +++ b/app/src/main/res/drawable/yellow_gabyou.png Binary files differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2b29915..20e04a9 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -8,7 +8,7 @@ + app:layout_constraintTop_toTopOf="parent" + tools:layout_editor_absoluteX="0dp"> + android:layout_width="match_parent" + android:layout_height="140dp" + android:gravity="center|center_vertical" + android:paddingTop="45dp" + android:paddingLeft="25dp" + android:paddingRight="25dp" + android:text="Text" + android:textColor="@color/black" + android:textSize="24sp" + android:textStyle="bold" + android:typeface="monospace" /> - + - + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_edit.xml b/app/src/main/res/layout/fragment_edit.xml index b8b3ef5..6b326e4 100644 --- a/app/src/main/res/layout/fragment_edit.xml +++ b/app/src/main/res/layout/fragment_edit.xml @@ -1,64 +1,36 @@ - -