mobile/Aegis
mobile/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis synced 2024-07-09 12:05:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1184 from alexbakker/no-nested-recyclerview

Browse Source 
Never wrap RecyclerView with a NestedScrollView
This commit is contained in:
Michael Schättgen 2023-09-10 00:32:41 +02:00 committed by GitHub
commit b84ecf15da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/beemdevelopment/aegis/ui/GroupManagerActivity.java
View File

@ -24,7 +24,7 @@ import java.util.Objects;
public class GroupManagerActivity extends AegisActivity implements GroupAdapter.Listener { public class GroupManagerActivity extends AegisActivity implements GroupAdapter.Listener {
private GroupAdapter _adapter; private GroupAdapter _adapter;
private HashSet<String> _removedGroups; private HashSet<String> _removedGroups;
private RecyclerView _slotsView; private RecyclerView _groupsView;
private View _emptyStateView; private View _emptyStateView;
private BackPressHandler _backPressHandler; private BackPressHandler _backPressHandler;
@ -51,11 +51,11 @@ public class GroupManagerActivity extends AegisActivity implements GroupAdapter.
} }
_adapter = new GroupAdapter(this); _adapter = new GroupAdapter(this);
_slotsView= findViewById(R.id.list_slots); _groupsView = findViewById(R.id.list_groups);
LinearLayoutManager layoutManager = new LinearLayoutManager(this); LinearLayoutManager layoutManager = new LinearLayoutManager(this);
_slotsView.setLayoutManager(layoutManager); _groupsView.setLayoutManager(layoutManager);
_slotsView.setAdapter(_adapter); _groupsView.setAdapter(_adapter);
_slotsView.setNestedScrollingEnabled(false); _groupsView.setNestedScrollingEnabled(false);
for (String group : _vaultManager.getVault().getGroups()) { for (String group : _vaultManager.getVault().getGroups()) {
_adapter.addGroup(group); _adapter.addGroup(group);
@ -135,10 +135,10 @@ public class GroupManagerActivity extends AegisActivity implements GroupAdapter.
private void updateEmptyState() { private void updateEmptyState() {
if (_adapter.getItemCount() > 0) { if (_adapter.getItemCount() > 0) {
_slotsView.setVisibility(View.VISIBLE); _groupsView.setVisibility(View.VISIBLE);
_emptyStateView.setVisibility(View.GONE); _emptyStateView.setVisibility(View.GONE);
} else { } else {
_slotsView.setVisibility(View.GONE); _groupsView.setVisibility(View.GONE);
_emptyStateView.setVisibility(View.VISIBLE); _emptyStateView.setVisibility(View.VISIBLE);
} }
} }

6
app/src/main/java/com/beemdevelopment/aegis/ui/fragments/preferences/IconPacksManagerFragment.java
View File

@ -44,7 +44,6 @@ public class IconPacksManagerFragment extends Fragment implements IconPackAdapte
@Inject @Inject
VaultManager _vaultManager; VaultManager _vaultManager;
private View _iconPacksView;
private RecyclerView _iconPacksRecyclerView; private RecyclerView _iconPacksRecyclerView;
private IconPackAdapter _adapter; private IconPackAdapter _adapter;
private LinearLayout _noIconPacksView; private LinearLayout _noIconPacksView;
@ -62,7 +61,6 @@ public class IconPacksManagerFragment extends Fragment implements IconPackAdapte
_noIconPacksView = view.findViewById(R.id.vEmptyList); _noIconPacksView = view.findViewById(R.id.vEmptyList);
((TextView) view.findViewById(R.id.txt_no_icon_packs)).setMovementMethod(LinkMovementMethod.getInstance()); ((TextView) view.findViewById(R.id.txt_no_icon_packs)).setMovementMethod(LinkMovementMethod.getInstance());
_iconPacksView = view.findViewById(R.id.view_icon_packs);
_adapter = new IconPackAdapter(this); _adapter = new IconPackAdapter(this);
_iconPacksRecyclerView = view.findViewById(R.id.list_icon_packs); _iconPacksRecyclerView = view.findViewById(R.id.list_icon_packs);
LinearLayoutManager layoutManager = new LinearLayoutManager(requireContext()); LinearLayoutManager layoutManager = new LinearLayoutManager(requireContext());
@ -169,10 +167,10 @@ public class IconPacksManagerFragment extends Fragment implements IconPackAdapte
private void updateEmptyState() { private void updateEmptyState() {
if (_adapter.getItemCount() > 0) { if (_adapter.getItemCount() > 0) {
_iconPacksView.setVisibility(View.VISIBLE); _iconPacksRecyclerView.setVisibility(View.VISIBLE);
_noIconPacksView.setVisibility(View.GONE); _noIconPacksView.setVisibility(View.GONE);
} else { } else {
_iconPacksView.setVisibility(View.GONE); _iconPacksRecyclerView.setVisibility(View.GONE);
_noIconPacksView.setVisibility(View.VISIBLE); _noIconPacksView.setVisibility(View.VISIBLE);
} }
} }

20
app/src/main/res/layout/activity_groups.xml
View File

@ -18,23 +18,11 @@
android:background="?attr/colorAppBar" /> android:background="?attr/colorAppBar" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView <androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent" android:id="@+id/list_groups"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> android:layout_width="match_parent"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_slots"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="vertical"/>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

21
app/src/main/res/layout/fragment_icon_packs.xml
View File

@ -47,26 +47,11 @@
</LinearLayout> </LinearLayout>
<androidx.core.widget.NestedScrollView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/view_icon_packs" android:id="@+id/list_icon_packs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_icon_packs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="vertical"/>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab" android:id="@+id/fab"