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

Merge branch 'master' of https://github.com/alexbakker/Aegis

Browse source
This commit is contained in:
Michael Schättgen 2018-01-03 23:36:24 +01:00
commit 855f5e519f
12 changed files with 103 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

182
app/src/main/res/layout/activity_add_profile.xml
View file

@ -1,182 +0,0 @@
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:id="@+id/viewA"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.6"
android:background="@color/colorPrimary"
android:orientation="horizontal">
<LinearLayout
android:orientation="vertical"
android:layout_width="360dp"
android:layout_height="80dp"
android:paddingLeft="50dp"
android:layout_gravity="center_vertical">
<TextView
android:text="Profile name"
android:layout_width="111dp"
android:layout_height="wrap_content"
android:id="@+id/textView"
android:layout_weight="0.53"
android:gravity="bottom"
android:textSize="16sp"
android:textColor="@color/secondary_text_inverted"
android:layout_marginLeft="3dp"/>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPersonName"
android:ems="10"
android:textColor="@color/primary_text_inverted"
android:paddingTop="0dp"
android:id="@+id/addProfileName"
android:textSize="28sp"
android:paddingRight="0dp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/viewB"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.4"
android:background="?attr/background"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="250dp"
>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_vpn_key_black_24dp"
android:id="@+id/imageView3"
android:layout_weight="1"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginTop="16dp"
android:tint="@color/cardview_dark_background"/>
<TextView
android:text="SHA1"
android:layout_height="wrap_content"
android:id="@+id/tvAlgorithm"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:textColor="?attr/primaryText"
android:textSize="18sp"
android:layout_alignBottom="@+id/imageView3"
android:layout_toRightOf="@+id/imageView3"
android:layout_toEndOf="@+id/imageView3"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_person_black_24dp"
android:id="@+id/ivIssuer"
android:layout_weight="1"
android:layout_marginTop="10dp"
android:tint="@color/cardview_dark_background"
android:layout_below="@+id/imageView3"
android:layout_alignLeft="@+id/imageView3"
android:layout_alignStart="@+id/imageView3"/>
<TextView
android:text="GitHub"
android:layout_height="wrap_content"
android:id="@+id/tvIssuer"
android:layout_weight="1"
android:layout_width="wrap_content"
android:textSize="18sp"
android:textColor="?attr/primaryText"
android:layout_alignBottom="@+id/ivIssuer"
android:layout_alignLeft="@+id/tvAlgorithm"
android:layout_alignStart="@+id/tvAlgorithm"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_timelapse_black_24dp"
android:id="@+id/ivPeriod"
android:layout_weight="1"
android:layout_marginTop="13dp"
android:tint="@color/cardview_dark_background"
android:layout_below="@+id/ivIssuer"
android:layout_alignLeft="@+id/ivIssuer"
android:layout_alignStart="@+id/ivIssuer"/>
<TextView
android:text="30 seconds"
android:layout_height="wrap_content"
android:id="@+id/tvPeriod"
android:layout_weight="1"
android:layout_width="wrap_content"
android:textSize="18sp"
android:textColor="?attr/primaryText"
android:layout_alignBottom="@+id/ivPeriod"
android:layout_alignLeft="@+id/tvIssuer"
android:layout_alignStart="@+id/tvIssuer"
android:layout_marginBottom="2dp"/>
</RelativeLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Medium Text"
android:id="@+id/tvOtp"
android:textSize="36sp"
android:textColor="?attr/primaryText"
android:layout_alignParentBottom="true"
android:layout_toRightOf="@+id/tvAlgorithm"
android:layout_toEndOf="@+id/tvAlgorithm"
android:layout_weight="1"
android:gravity="center_horizontal|center"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:clickable="true"
app:layout_anchor="@id/viewA"
app:layout_anchorGravity="bottom|right|end"
android:src="@drawable/ic_check"/>
<!---->
</android.support.design.widget.CoordinatorLayout>

4
app/src/main/res/layout/activity_edit_profile.xml
View file

@ -124,7 +124,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
@ -147,7 +147,7 @@
android:textColor="#808080"/>
</RelativeLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"/>
</LinearLayout>