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

Replace CircleImageView with ShapeableImageView

Browse source
This commit is contained in:
Alexander Bakker 2024-08-26 22:02:30 +02:00
parent 7ce72e046a
commit 99e633d61a
10 changed files with 40 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -189,7 +189,6 @@ dependencies {
} }
implementation 'com.mikepenz:aboutlibraries-core-android:11.2.2' implementation 'com.mikepenz:aboutlibraries-core-android:11.2.2'
implementation 'com.nulab-inc:zxcvbn:1.9.0' implementation 'com.nulab-inc:zxcvbn:1.9.0'
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'net.lingala.zip4j:zip4j:2.11.5' implementation 'net.lingala.zip4j:zip4j:2.11.5'
implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1' implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1'
implementation 'org.simpleflatmapper:sfm-csv:8.2.3' implementation 'org.simpleflatmapper:sfm-csv:8.2.3'

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

@ -71,6 +71,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.android.material.chip.Chip; import com.google.android.material.chip.Chip;
import com.google.android.material.chip.ChipGroup; import com.google.android.material.chip.ChipGroup;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.imageview.ShapeableImageView;
import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout; import com.google.android.material.textfield.TextInputLayout;
@ -92,8 +93,6 @@ import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import de.hdodenhof.circleimageview.CircleImageView;
public class EditEntryActivity extends AegisActivity { public class EditEntryActivity extends AegisActivity {
private boolean _isNew = false; private boolean _isNew = false;
private boolean _isManual = false; private boolean _isManual = false;
@ -103,7 +102,7 @@ public class EditEntryActivity extends AegisActivity {
// keep track of icon changes separately as the generated jpeg's are not deterministic // keep track of icon changes separately as the generated jpeg's are not deterministic
private boolean _hasChangedIcon = false; private boolean _hasChangedIcon = false;
private IconPack.Icon _selectedIcon; private IconPack.Icon _selectedIcon;
private CircleImageView _iconView; private ShapeableImageView _iconView;
private ImageView _saveImageButton; private ImageView _saveImageButton;
private TextInputEditText _textName; private TextInputEditText _textName;

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

@ -37,12 +37,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="250dp"> android:layout_height="250dp">
<de.hdodenhof.circleimageview.CircleImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/profile_drawable" android:id="@+id/profile_drawable"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_centerVertical="true" /> android:layout_centerVertical="true"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
<com.avito.android.krop.KropView <com.avito.android.krop.KropView
android:id="@+id/krop_view" android:id="@+id/krop_view"

10
app/src/main/res/layout/card_assign_icon_entry.xml
View file

@ -47,11 +47,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/ivOldImage" android:id="@+id/ivOldImage"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
<ImageView <ImageView
android:layout_width="32dp" android:layout_width="32dp"
@ -62,11 +63,12 @@
android:layout_marginEnd="15dp" android:layout_marginEnd="15dp"
android:layout_gravity="center_vertical"/> android:layout_gravity="center_vertical"/>
<de.hdodenhof.circleimageview.CircleImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/ivNewImage" android:id="@+id/ivNewImage"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
<View <View
android:layout_width="0dp" android:layout_width="0dp"

10
app/src/main/res/layout/card_entry.xml
View file

@ -34,14 +34,15 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingStart="14dp"> android:paddingStart="14dp">
<de.hdodenhof.circleimageview.CircleImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/ivTextDrawable" android:id="@+id/ivTextDrawable"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentStart="true" /> android:layout_alignParentStart="true"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
<de.hdodenhof.circleimageview.CircleImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/ivSelected" android:id="@+id/ivSelected"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
@ -49,7 +50,8 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/item_selected" android:src="@drawable/item_selected"
android:visibility="gone" android:visibility="gone"
app:civ_circle_background_color="?attr/colorPrimaryAlternative" /> android:background="?attr/colorPrimaryAlternative"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout

10
app/src/main/res/layout/card_entry_compact.xml
View file

@ -36,14 +36,15 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingStart="12dp"> android:paddingStart="12dp">
<de.hdodenhof.circleimageview.CircleImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/ivTextDrawable" android:id="@+id/ivTextDrawable"
android:layout_width="45dp" android:layout_width="45dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_centerVertical="true" /> android:layout_centerVertical="true"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
<de.hdodenhof.circleimageview.CircleImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/ivSelected" android:id="@+id/ivSelected"
android:layout_width="45dp" android:layout_width="45dp"
android:layout_height="45dp" android:layout_height="45dp"
@ -51,7 +52,8 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/item_selected" android:src="@drawable/item_selected"
android:visibility="gone" android:visibility="gone"
app:civ_circle_background_color="?attr/colorPrimaryAlternative" /> android:background="?attr/colorPrimaryAlternative"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout

10
app/src/main/res/layout/card_entry_small.xml
View file

@ -36,14 +36,15 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingStart="14dp"> android:paddingStart="14dp">
<de.hdodenhof.circleimageview.CircleImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/ivTextDrawable" android:id="@+id/ivTextDrawable"
android:layout_width="45dp" android:layout_width="45dp"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentStart="true" /> android:layout_alignParentStart="true"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
<de.hdodenhof.circleimageview.CircleImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/ivSelected" android:id="@+id/ivSelected"
android:layout_width="45dp" android:layout_width="45dp"
android:layout_height="45dp" android:layout_height="45dp"
@ -51,7 +52,8 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/item_selected" android:src="@drawable/item_selected"
android:visibility="gone" android:visibility="gone"
app:civ_circle_background_color="?attr/colorPrimaryAlternative" /> android:background="?attr/colorPrimaryAlternative"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout

10
app/src/main/res/layout/card_entry_tile.xml
View file

@ -46,14 +46,15 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent"> android:layout_height="match_parent">
<de.hdodenhof.circleimageview.CircleImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/ivTextDrawable" android:id="@+id/ivTextDrawable"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:layout_alignParentStart="true" /> android:layout_alignParentStart="true"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
<de.hdodenhof.circleimageview.CircleImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/ivSelected" android:id="@+id/ivSelected"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
@ -61,7 +62,8 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:src="@drawable/item_selected" android:src="@drawable/item_selected"
android:visibility="gone" android:visibility="gone"
app:civ_circle_background_color="?attr/colorPrimaryAlternative" /> android:background="?attr/colorPrimaryAlternative"
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Aegis.ImageView.Circle" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout

23
app/src/main/res/raw/aboutlibraries.json
View file

@ -2543,29 +2543,6 @@
"MIT" "MIT"
] ]
}, },
{
"uniqueId": "de.hdodenhof:circleimageview",
"funding": [
],
"developers": [
{
"name": "Henning Dodenhof"
}
],
"artifactVersion": "3.1.0",
"description": "A fast circular ImageView for Android",
"scm": {
"connection": "scm:git@github.com:hdodenhof/CircleImageView.git",
"url": "https://github.com/hdodenhof/CircleImageView",
"developerConnection": "scm:git@github.com:hdodenhof/CircleImageView.git"
},
"name": "CircleImageView",
"website": "https://github.com/hdodenhof/CircleImageView",
"licenses": [
"Apache-2.0"
]
},
{ {
"uniqueId": "info.guardianproject.trustedintents:trustedintents", "uniqueId": "info.guardianproject.trustedintents:trustedintents",
"funding": [ "funding": [

5
app/src/main/res/values/themes.xml
View file

@ -263,4 +263,9 @@
<item name="cornerFamily">rounded</item> <item name="cornerFamily">rounded</item>
<item name="cornerSize">8dp</item> <item name="cornerSize">8dp</item>
</style> </style>
<style name="ShapeAppearanceOverlay.Aegis.ImageView.Circle" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">50%</item>
</style>
</resources> </resources>