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

Improve the layout of EditProfileActivity a bit

Browse source 
It's still pretty broken
This commit is contained in:
Alexander Bakker 2018-01-02 18:49:35 +01:00
parent 6a122fb515
commit 22c5237129
3 changed files with 173 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/AndroidManifest.xml
View file

@ -39,7 +39,7 @@
<activity <activity
android:name=".EditProfileActivity" android:name=".EditProfileActivity"
android:label="Edit profile" android:label="Edit profile"
android:theme="@style/AppTheme.TransparentActionBar"> android:theme="@style/AppTheme.Default.TransparentActionBar">
</activity> </activity>
<activity <activity
android:name=".IntroActivity" android:name=".IntroActivity"
@ -48,7 +48,8 @@
</activity> </activity>
<activity <activity
android:name=".AuthActivity" android:name=".AuthActivity"
android:launchMode="singleTop"> android:launchMode="singleTop"
android:theme="@style/AppTheme.Default.NoActionBar">
</activity> </activity>
<activity android:name=".PreferencesActivity"> <activity android:name=".PreferencesActivity">
</activity> </activity>

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

@ -1,185 +1,188 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:descendantFocusability="beforeDescendants" android:orientation="vertical">
android:focusableInTouchMode="true"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:layout_width="match_parent" <ScrollView
android:layout_height="match_parent" android:layout_width="match_parent"
android:orientation="vertical"> android:layout_height="match_parent">
<RelativeLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="0.66"
android:background="@color/colorPrimary"
android:orientation="horizontal">
<ImageView
android:layout_width="100dp"
android:layout_height="100dp"
android:id="@+id/profile_drawable"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"/>
</RelativeLayout>
<TableLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.33"
android:background="?attr/background"
android:orientation="vertical" android:orientation="vertical"
android:stretchColumns="1" android:descendantFocusability="beforeDescendants"
android:layout_marginEnd="35dp"> android:focusableInTouchMode="true">
<TableRow <RelativeLayout
android:layout_marginTop="5dp" android:layout_width="match_parent"
android:layout_marginBottom="5dp"> android:layout_height="200dp"
<ImageView android:layout_column="0" android:background="@color/colorPrimary">
android:layout_width="wrap_content" <ImageView
android:layout_height="wrap_content" android:layout_width="100dp"
android:src="@drawable/ic_person_black_24dp" android:layout_height="100dp"
android:layout_weight="1" android:id="@+id/profile_drawable"
android:layout_marginTop="10dp" android:layout_centerInParent="true"/>
android:tint="@color/cardview_dark_background"
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"/>
<EditText android:layout_column="1" </RelativeLayout>
android:id="@+id/text_name"
android:hint="Name"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</TableRow>
<TableRow <TableLayout
android:layout_marginTop="5dp" android:layout_width="match_parent"
android:layout_marginBottom="5dp"> android:layout_height="wrap_content"
<EditText android:layout_column="1" android:background="?attr/background"
android:id="@+id/text_issuer" android:orientation="vertical"
android:hint="Issuer" android:stretchColumns="1"
android:layout_width="match_parent" android:layout_marginEnd="35dp">
android:layout_height="wrap_content"/>
</TableRow>
<TableRow <TableRow
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"> android:layout_marginBottom="5dp">
<ImageView android:layout_column="0" <ImageView android:layout_column="0"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_info_outline_black_24dp"
android:layout_weight="1"
android:layout_marginTop="10dp"
android:tint="@color/cardview_dark_background"
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"/>
<LinearLayout android:layout_column="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Spinner
android:id="@+id/spinner_type"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
<Spinner
android:id="@+id/spinner_algo"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
<Spinner
android:id="@+id/spinner_digits"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
</LinearLayout>
</TableRow>
<TableRow
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<ImageView android:layout_column="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_timelapse_black_24dp"
android:layout_weight="1"
android:layout_marginTop="10dp"
android:tint="@color/cardview_dark_background"
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_person_black_24dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:layout_marginTop="10dp"
<EditText android:tint="@color/cardview_dark_background"
android:id="@+id/text_period" android:layout_marginStart="15dp"
android:layout_width="match_parent" android:layout_marginEnd="20dp"/>
android:layout_height="wrap_content"
android:layout_alignParentStart="true" <EditText android:layout_column="1"
android:layout_gravity="center" android:id="@+id/text_name"
android:inputType="numberDecimal"/> android:hint="Name"
<TextView android:layout_width="match_parent"
android:id="@+id/text_hint" android:layout_height="wrap_content"/>
android:layout_width="wrap_content" </TableRow>
android:layout_height="wrap_content"
android:layout_alignParentEnd="true" <TableRow
android:layout_centerVertical="true" android:layout_marginTop="5dp"
android:text="seconds" android:layout_marginBottom="5dp">
android:textSize="18sp" <EditText android:layout_column="1"
android:layout_marginEnd="10dp" android:id="@+id/text_issuer"
android:textColor="#808080"/> android:hint="Issuer"
</RelativeLayout> android:layout_width="match_parent"
<LinearLayout android:layout_height="wrap_content"/>
android:layout_width="fill_parent" </TableRow>
<TableRow
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<ImageView android:layout_column="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"/> android:src="@drawable/ic_info_outline_black_24dp"
</LinearLayout> android:layout_weight="1"
</TableRow> android:layout_marginTop="10dp"
android:tint="@color/cardview_dark_background"
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"/>
<TableRow <LinearLayout android:layout_column="1"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<ImageView android:layout_column="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_vpn_key_black_24dp"
android:layout_weight="1"
android:layout_marginTop="10dp"
android:tint="@color/cardview_dark_background"
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"/>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hintEnabled="false"
app:passwordToggleEnabled="true">
<EditText
android:id="@+id/text_secret"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="Secret (base32)" android:orientation="horizontal"
android:inputType="textPassword"/> android:gravity="center_vertical">
</android.support.design.widget.TextInputLayout> <Spinner
</TableRow> android:id="@+id/spinner_type"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="4"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
<Spinner
android:id="@+id/spinner_algo"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="4"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
<Spinner
android:id="@+id/spinner_digits"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
</LinearLayout>
</TableLayout> </TableRow>
</LinearLayout> <TableRow
</android.support.design.widget.CoordinatorLayout> android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<ImageView android:layout_column="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_timelapse_black_24dp"
android:layout_weight="1"
android:layout_marginTop="10dp"
android:tint="@color/cardview_dark_background"
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<EditText
android:id="@+id/text_period"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_gravity="center"
android:inputType="numberDecimal"/>
<TextView
android:id="@+id/text_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:text="seconds"
android:textSize="18sp"
android:layout_marginEnd="10dp"
android:textColor="#808080"/>
</RelativeLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"/>
</LinearLayout>
</TableRow>
<TableRow
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp">
<ImageView android:layout_column="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_vpn_key_black_24dp"
android:layout_weight="1"
android:layout_marginTop="10dp"
android:tint="@color/cardview_dark_background"
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"/>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hintEnabled="false"
app:passwordToggleEnabled="true">
<android.support.design.widget.TextInputEditText
android:id="@+id/text_secret"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Secret (base32)"
android:inputType="textPassword"/>
</android.support.design.widget.TextInputLayout>
</TableRow>
</TableLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>

2
app/src/main/res/values/styles.xml
View file

@ -30,7 +30,7 @@
</style> </style>
<style name="Theme.Intro" parent="Theme.AppCompat.NoActionBar"> <style name="Theme.Intro" parent="Theme.AppCompat.NoActionBar">
<item name="swirl_ridgeColor">@color/colorSwirlPrimary</item> <item name="swirl_ridgeColor">@color/primary_text_inverted</item>
<item name="swirl_errorColor">@color/colorSwirlError</item> <item name="swirl_errorColor">@color/colorSwirlError</item>
<item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowIsTranslucent">true</item> <item name="android:windowIsTranslucent">true</item>