TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-13 04:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/loki-project/loki-messenger-android

Browse Source
This commit is contained in:
Mikunj 2019-06-04 15:00:41 +10:00
commit e2fe979cc1
1 changed files with 41 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
res/layout/activity_account_details.xml
View File

@ -3,24 +3,17 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:background="@color/white" android:background="@color/white"
android:fillViewport="true" android:fillViewport="true"
tools:context=".AccountDetailsActivity"> tools:context=".loki.AccountDetailsActivity">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:id="@+id/header"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:layout_alignParentTop="true"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
@ -28,40 +21,24 @@
style="@style/Signal.Text.Headline.Registration" style="@style/Signal.Text.Headline.Registration"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginTop="40dp"
android:gravity="center" android:text="@string/activity_account_details_title"
android:paddingBottom="16dp" android:textAlignment="center" />
android:text="@string/activity_account_details_title" />
<TextView <TextView
android:id="@+id/subtitleTextView" android:id="@+id/subtitleTextView"
style="@style/Signal.Text.Body" style="@style/Signal.Text.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:layout_marginTop="16dp"
android:text="@string/activity_account_details_subtitle" /> android:text="@string/activity_account_details_subtitle"
android:textAlignment="center" />
</LinearLayout>
<LinearLayout
android:id="@+id/container"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/header"
android:layout_marginStart="32dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="32dp"
android:animateLayoutChanges="true"
android:orientation="vertical"
android:paddingBottom="0dp"
android:clipToPadding="false"
android:clipChildren="false"
tools:visibility="gone">
<org.thoughtcrime.securesms.components.LabeledEditText <org.thoughtcrime.securesms.components.LabeledEditText
android:id="@+id/nameEditText" android:id="@+id/nameEditText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp"
app:labeledEditText_background="@color/white" app:labeledEditText_background="@color/white"
app:labeledEditText_label="Display Name (Optional)"/> app:labeledEditText_label="Display Name (Optional)"/>
@ -69,8 +46,8 @@
android:id="@+id/nextButton" android:id="@+id/nextButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_gravity="center_horizontal"
android:background="@color/signal_primary" android:background="@color/signal_primary"
android:textColor="@color/white" android:textColor="@color/white"
app:cpb_colorIndicator="@color/white" app:cpb_colorIndicator="@color/white"
@ -81,6 +58,4 @@
</LinearLayout> </LinearLayout>
</RelativeLayout>
</ScrollView> </ScrollView>