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

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>

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

@ -1,35 +1,36 @@
<?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:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="200dp"
android:layout_weight="0.66" android:background="@color/colorPrimary">
android:background="@color/colorPrimary"
android:orientation="horizontal">
<ImageView <ImageView
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="100dp" android:layout_height="100dp"
android:id="@+id/profile_drawable" android:id="@+id/profile_drawable"
android:layout_centerVertical="true" android:layout_centerInParent="true"/>
android:layout_centerHorizontal="true"/>
</RelativeLayout> </RelativeLayout>
<TableLayout <TableLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="0.33"
android:background="?attr/background" android:background="?attr/background"
android:orientation="vertical" android:orientation="vertical"
android:stretchColumns="1" android:stretchColumns="1"
@ -81,24 +82,25 @@
<LinearLayout android:layout_column="1" <LinearLayout android:layout_column="1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal"
android:gravity="center_vertical">
<Spinner <Spinner
android:id="@+id/spinner_type" android:id="@+id/spinner_type"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="3" android:layout_weight="4"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/> style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
<Spinner <Spinner
android:id="@+id/spinner_algo" android:id="@+id/spinner_algo"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="3" android:layout_weight="4"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/> style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
<Spinner <Spinner
android:id="@+id/spinner_digits" android:id="@+id/spinner_digits"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="3"
style="@style/Base.Widget.AppCompat.Spinner.Underlined"/> style="@style/Base.Widget.AppCompat.Spinner.Underlined"/>
</LinearLayout> </LinearLayout>
@ -170,7 +172,7 @@
app:hintEnabled="false" app:hintEnabled="false"
app:passwordToggleEnabled="true"> app:passwordToggleEnabled="true">
<EditText <android.support.design.widget.TextInputEditText
android:id="@+id/text_secret" 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"
@ -182,4 +184,5 @@
</TableLayout> </TableLayout>
</LinearLayout> </LinearLayout>
</android.support.design.widget.CoordinatorLayout> </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>