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

Merge remote-tracking branch 'origin/custom-images'

Browse source
This commit is contained in:
Alexander Bakker 2018-06-07 12:27:42 +02:00
commit 04dbb71cd7
17 changed files with 302 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,18 +16,36 @@
android:layout_height="250dp"
android:background="@color/colorPrimary">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="200dp"
android:paddingTop="100dp"
android:background="@color/colorPrimary">
<ImageView
<de.hdodenhof.circleimageview.CircleImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/profile_drawable"
android:layout_width="100dp"
android:layout_height="100dp"
android:id="@+id/profile_drawable"
android:scaleType="centerCrop"
android:layout_centerHorizontal="true"/>
</RelativeLayout>
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
/>
<com.avito.android.krop.KropView
android:id="@+id/krop_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:visibility="invisible"
app:krop_aspectX="1"
app:krop_aspectY="1"
app:krop_offset="70dp"
app:krop_overlayColor="#aaffffff" >
<ImageView
android:id="@+id/iv_saveImage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:layout_margin="15dp"
android:src="@drawable/ic_check_black_24dp"
android:tint="?attr/iconColorPrimary" />
</com.avito.android.krop.KropView>
</RelativeLayout>

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

@ -21,12 +21,14 @@
android:layout_height="match_parent"
android:paddingLeft="16dp">
<ImageView android:layout_width="60dp"
android:layout_height="60dp"
android:id="@+id/ivTextDrawable"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/ivTextDrawable"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
/>
</RelativeLayout>
<RelativeLayout

95
app/src/main/res/layout/fragment_authentication_slide.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main"
android:orientation="vertical"
android:layout_width="match_parent"
@ -7,78 +8,94 @@
android:padding="32dp">
<TextView
android:text="@string/choose_authentication_method"
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="24sp"
android:text="@string/choose_authentication_method"
android:textAlignment="center"
android:textColor="@color/primary_text_inverted"
android:id="@+id/textView2" />
android:textSize="24sp"
android:layout_marginTop="30dp"
android:textStyle="bold" />
<ImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="140dp"
android:layout_marginBottom="100dp"
android:layout_marginTop="70dp"
app:srcCompat="@drawable/ic_id_card" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_marginTop="12dp">
android:layout_alignParentBottom="true"
android:layout_marginTop="12dp"
android:orientation="horizontal">
<RadioGroup
android:layout_width="match_parent"
android:id="@+id/rg_authenticationMethod"
android:layout_width="match_parent"
android:layout_height="187dp">
<RadioButton
android:id="@+id/rb_none"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:id="@+id/rb_none"
android:text="@string/authentication_method_none"/>
android:text="@string/authentication_method_none"
android:textSize="16sp" />
<TextView
android:text="@string/authentication_method_none_description"
android:layout_width="match_parent"
android:textColor="@color/secondary_text_inverted"
android:layout_marginTop="-5dp"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="-5dp"
android:text="@string/authentication_method_none_description"
android:textColor="@color/secondary_text_inverted" />
<RadioButton
android:id="@+id/rb_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checked="true"
android:text="@string/authentication_method_password"
android:textSize="16sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="-5dp"
android:text="@string/authentication_method_password_description"
android:textColor="@color/secondary_text_inverted" />
<RadioButton
android:id="@+id/rb_fingerprint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/authentication_method_fingerprint"
android:textSize="16sp"
/>
<RadioButton
android:text="@string/authentication_method_password"
android:layout_width="match_parent"
android:textSize="16sp"
android:layout_height="wrap_content"
android:id="@+id/rb_password"
android:checked="true"/>
<TextView
android:text="@string/authentication_method_password_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-5dp"
android:textColor="@color/secondary_text_inverted"
android:layout_marginStart="32dp"/>
<RadioButton
android:text="@string/authentication_method_fingerprint"
android:layout_width="match_parent"
android:textSize="16sp"
android:layout_height="wrap_content"
android:id="@+id/rb_fingerprint"
android:visibility="invisible"/>
<TextView
android:id="@+id/text_rb_fingerprint"
android:text="@string/authentication_method_fingerprint_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-5dp"
android:textColor="@color/secondary_text_inverted"
android:layout_marginStart="32dp"
android:visibility="invisible"/>
android:layout_marginTop="-5dp"
android:text="@string/authentication_method_fingerprint_description"
android:textColor="@color/disabled_textview_colors"
/>
</RadioGroup>
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"