better UI for editfragment

zorgluf · zorgluf · commit 6df32314afe5 · 2024-05-12T14:31:26.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.0'
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
     }
 }
@@ -76,6 +76,6 @@ dependencies {
 
 buildscript {
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.0'
     }
 }
diff --git a/app/src/main/java/fr/nuage/souvenirs/view/EditAlbumFragment.java b/app/src/main/java/fr/nuage/souvenirs/view/EditAlbumFragment.java
@@ -34,15 +34,15 @@
 import fr.nuage.souvenirs.viewmodel.AlbumViewModel;
 import fr.nuage.souvenirs.viewmodel.PageViewModel;
 
-public class EditAlbumFragment extends Fragment implements SelectPageStyleFragment.OnSelectPageStyleListener {
+public class EditAlbumFragment extends Fragment {
 
     private static final String DIALOG_CHANGE_STYLE = "DIALOG_CHANGE_STYLE";
 
     private EditPageListAdapter editPageListAdapter;
     private AlbumViewModel albumVM;
     private String albumPath;
     private UUID initialPageFocusId;
-    private int colNb = 1;
+    private int colNb = 3;
 
     private PageViewModel lastOperationPage;
 
@@ -71,7 +71,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 
         //inflateview
         FragmentEditAlbumBinding binding = DataBindingUtil.inflate(inflater,R.layout.fragment_edit_album,container,false);
-        binding.setFragment(this);
 
         //set recyclerview
         RecyclerView pageListRecyclerView = binding.pageList;
@@ -93,6 +92,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
             AlbumViewModel albumVM = albumListViewModel.getAlbum(albumPath);
             if (albumVM != null) {
                 setAlbumVM(albumVM);
+                binding.setAlbum(albumVM);
                 albumVM.getLdPages().observe(lifecycleOwner, PageViewModels -> editPageListAdapter.updateList(PageViewModels));
                 getActivity().setTitle(albumVM.getName().getValue());
                 albumVM.getName().observe(lifecycleOwner, s -> getActivity().setTitle(albumVM.getName().getValue()));
@@ -119,13 +119,6 @@ public void onAddPage(PageViewModel previousPage) {
         Navigation.findNavController(getView()).navigate(action);
     }
 
-    public void onSwitchLayout(PageViewModel p) {
-        //save page
-        lastOperationPage = p;
-        //launch select style dialog
-        SelectPageStyleDialogFragment dialog = SelectPageStyleDialogFragment.newInstance(this,-1,-1);
-        dialog.show(getParentFragmentManager(),DIALOG_CHANGE_STYLE);
-    }
 
     public void openPageEdition(View v) {
         String pageId = (String)v.getTag();
@@ -135,20 +128,6 @@ public void openPageEdition(View v) {
     }
 
 
-    @Override
-    public void onStyleSelected(int style) {
-        //check which dialog was launched
-        Fragment dialogChangeStyle = getParentFragmentManager().findFragmentByTag(DIALOG_CHANGE_STYLE);
-        if (dialogChangeStyle != null) {
-            //dismiss dialog
-            DialogFragment df = (DialogFragment) dialogChangeStyle;
-            df.dismiss();
-            //switch style
-            albumVM.switchStyle(lastOperationPage,style);
-        }
-
-    }
-
     @Override
     public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_edit_album, menu);
@@ -165,57 +144,8 @@ public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
             onAddPage(albumVM.getPage(-1));
             return true;
         });
-        //set listener to switch display
-        MenuItem displayColunmItem = menu.findItem(R.id.display_column_edit_album);
-        displayColunmItem.setOnMenuItemClickListener(menuItem -> {
-            //change columns
-            colNb = (colNb == 1) ? 2 : 1;
-            //change layout of recyclerview
-            RecyclerView pageListRecyclerView = getView().findViewById(R.id.page_list);
-            RecyclerView.LayoutManager mLayoutManager = new GridLayoutManager(getActivity(), colNb);
-            pageListRecyclerView.setLayoutManager(mLayoutManager);
-            getActivity().invalidateOptionsMenu();
-            return true;
-        });
-    }
-
-    @Override
-    public void onPrepareOptionsMenu (@NonNull Menu menu) {
-        if (colNb != 1) {
-            menu.findItem(R.id.display_column_edit_album).setIcon(R.drawable.ic_view_one_column_24dp);
-        } else {
-            menu.findItem(R.id.display_column_edit_album).setIcon(R.drawable.ic_view_column_black_24dp);
-        }
     }
 
     public AlbumViewModel getAlbumVM() { return albumVM; }
 
-    public void onClickPageMenu(PageViewModel pageViewModel, View view) {
-        PopupMenu popupMenu = new PopupMenu(getContext(),view, Gravity.END);
-        popupMenu.inflate(R.menu.page_edit_menu);
-        popupMenu.setOnMenuItemClickListener(item -> {
-            switch (item.getItemId()) {
-                case R.id.menu_page_edit_insert:
-                    onAddPage(pageViewModel);
-                    return true;
-                case R.id.menu_page_edit_dispo:
-                    onSwitchLayout(pageViewModel);
-                    return true;
-                case R.id.menu_page_edit_delete:
-                    pageViewModel.delete();
-                    return true;
-                case R.id.menu_page_edit_move_up:
-                    pageViewModel.moveUp();
-                    return true;
-                case R.id.menu_page_edit_move_down:
-                    pageViewModel.moveDown();
-                    return true;
-            }
-            return false;
-        });
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            popupMenu.setForceShowIcon(true);
-        }
-        popupMenu.show();
-    }
 }
diff --git a/app/src/main/res/drawable/baseline_hide_image_24.xml b/app/src/main/res/drawable/baseline_hide_image_24.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M21,5c0,-1.1 -0.9,-2 -2,-2H5.83L21,18.17V5z"/>
+      
+    <path android:fillColor="@android:color/white" android:pathData="M2.81,2.81L1.39,4.22L3,5.83V19c0,1.1 0.9,2 2,2h13.17l1.61,1.61l1.41,-1.41L2.81,2.81zM6,17l3,-4l2.25,3l0.82,-1.1l2.1,2.1H6z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/edit_item_page_list.xml b/app/src/main/res/layout/edit_item_page_list.xml
@@ -11,46 +11,27 @@
             type="fr.nuage.souvenirs.view.EditAlbumFragment"/>
     </data>
 
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/mtrl_card_spacing"
-        android:layout_marginTop="@dimen/mtrl_card_spacing"
-        android:layout_marginRight="@dimen/mtrl_card_spacing"
-        android:layout_marginBottom="@dimen/mtrl_card_spacing">
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/page_parent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/mtrl_card_spacing"
-        android:layout_marginTop="@dimen/mtrl_card_spacing"
-        android:layout_marginRight="@dimen/mtrl_card_spacing"
-        android:layout_marginBottom="@dimen/mtrl_card_spacing"
         android:tag="@{page.id.toString()}"
         android:clickable="true"
         android:onClick="@{fragment::openPageEdition}"
         android:focusable="true">
 
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/page_menu_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
-            android:clickable="true"
-            app:layout_constraintBottom_toBottomOf="@+id/page_layout"
-            app:layout_constraintEnd_toEndOf="@+id/page_layout"
-            app:srcCompat="@drawable/ic_baseline_menu_24"
-            android:onClick="@{(view) -> fragment.onClickPageMenu(page,view)}"
-            android:focusable="true" />
+
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/page_layout"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginTop="8dp"
+            android:paddingStart="8dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="8dp"
+            android:paddingBottom="8dp"
             android:focusable="true"
             android:focusableInTouchMode="true"
             app:layout_constraintDimensionRatio="1:1"
@@ -60,6 +41,18 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <ImageView
+            android:id="@+id/del_imageview"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginEnd="-8dp"
+            android:layout_marginBottom="-8dp"
+            android:alpha="0.5"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:srcCompat="@drawable/ic_delete_forever_black_24dp"
+            android:onClick="@{() -> page.delete()}"/>
+
         <ImageView
             android:id="@+id/page_audio_status"
             android:layout_width="48dp"
@@ -75,7 +68,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-
-    </com.google.android.material.card.MaterialCardView>
-
 </layout>
diff --git a/app/src/main/res/layout/fragment_edit_album.xml b/app/src/main/res/layout/fragment_edit_album.xml
@@ -1,17 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
-        <variable
-            name="fragment"
-            type="fr.nuage.souvenirs.view.EditAlbumFragment"/>
+        <variable name="album" type="fr.nuage.souvenirs.viewmodel.AlbumViewModel"/>
+        <import type="android.view.View"/>
     </data>
 
 <androidx.constraintlayout.widget.ConstraintLayout
 android:layout_width="match_parent"
 android:layout_height="match_parent">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="@{(album.ldPages.size == 0) ? View.VISIBLE : View.GONE}">
+
+        <TextView
+            android:id="@+id/textView5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/empty_album"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/imageView7"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            app:layout_constraintBottom_toTopOf="@+id/textView5"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:srcCompat="@drawable/baseline_hide_image_24" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/page_list"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/menu/menu_edit_album.xml b/app/src/main/res/menu/menu_edit_album.xml
@@ -12,9 +12,4 @@
         android:icon="@drawable/ic_note_add_page_black_24dp"
         android:title="@string/action_menu_add_page"
         app:showAsAction="always|collapseActionView" />
-    <item
-        android:id="@+id/display_column_edit_album"
-        android:icon="@drawable/ic_view_column_black_24dp"
-        android:title="@string/action_menu_display_column"
-        app:showAsAction="always|collapseActionView" />
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -88,4 +88,5 @@
     <string name="record_sound_textView">Tap on the microphone to stop recording.</string>
     <string name="record_sound_onair_textView">Now recroding...</string>
     <string name="string_album_margin_settings">Margin size between elements</string>
+    <string name="empty_album">Album is empty.</string>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.4.0'
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ buildscript {`
`8`	`8`	`mavenCentral()`
`9`	`9`	`}`
`10`	`10`	`dependencies {`
`11`		`- classpath 'com.android.tools.build:gradle:8.3.2'`
	`11`	`+ classpath 'com.android.tools.build:gradle:8.4.0'`
`12`	`12`	`classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"`
`13`	`13`	`}`
`14`	`14`	`}`
`@@ -76,6 +76,6 @@ dependencies {`
`76`	`76`
`77`	`77`	`buildscript {`
`78`	`78`	`dependencies {`
`79`		`- classpath 'com.android.tools.build:gradle:8.3.2'`
	`79`	`+ classpath 'com.android.tools.build:gradle:8.4.0'`
`80`	`80`	`}`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`mavenCentral()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:8.3.2'`
	`10`	`+ classpath 'com.android.tools.build:gradle:8.4.0'`
`11`	`11`	`classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"`
`12`	`12`
`13`	`13`	`// NOTE: Do not place your application dependencies here; they belong`