luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-14 22:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1308 from michaelschattgen/fix/ui-inconsistencies

Browse source 
Fix a couple UI inconsistencies
This commit is contained in:
Alexander Bakker 2024-03-16 11:28:02 +01:00 • committed by GitHub
commit 2b2cac1ada
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
View file

@ -375,6 +375,7 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
} }
sortShownEntries(); sortShownEntries();
checkPeriodUniformity();
_view.onListChange(); _view.onListChange();
notifyDataSetChanged(); notifyDataSetChanged();
} }
@ -669,6 +670,10 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
return -1; return -1;
} }
if (infos.size() == 1) {
return infos.get(0).getPeriod();
}
Map<Integer, Integer> occurrences = new HashMap<>(); Map<Integer, Integer> occurrences = new HashMap<>();
for (TotpInfo info : infos) { for (TotpInfo info : infos) {
int period = info.getPeriod(); int period = info.getPeriod();

5
app/src/main/res/layout/activity_edit_entry.xml
View file

@ -98,7 +98,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginStart="44.5dp"> android:layout_marginStart="44.5dp">
@ -110,8 +110,9 @@
android:layout_weight="1"> android:layout_weight="1">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_issuer" android:id="@+id/text_issuer"
android:maxLines="1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:inputType="text"/> android:inputType="text"/>
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout