mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove redundant LinearLayout

Browse source
This commit is contained in:
veyndan 2017-03-03 18:03:00 +00:00
parent e1a7d80716
commit 86ab65c15f
1 changed files with 48 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

105
app/src/main/res/layout/activity_login.xml
View file

@ -8,6 +8,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="16dp"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
> >
@ -16,82 +17,72 @@
android:id="@+id/loginSubtitle" android:id="@+id/loginSubtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:drawablePadding="8dp"
android:text="@string/app_name"
android:textAppearance="?android:attr/textAppearanceMedium"
android:drawableTop="@drawable/commons_logo_large" android:drawableTop="@drawable/commons_logo_large"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:drawablePadding="8dp" android:text="@string/app_name"
android:textAppearance="?android:attr/textAppearanceMedium"
/> />
<LinearLayout <FrameLayout
android:id="@+id/loginErrors"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="48dp"
android:layout_margin="16dip" />
android:gravity="center"
android:orientation="vertical" <android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
> >
<FrameLayout <android.support.design.widget.TextInputEditText
android:id="@+id/loginErrors" android:id="@+id/loginUsername"
android:layout_width="match_parent"
android:layout_height="48dp"
/>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/username"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
> >
<android.support.design.widget.TextInputEditText <requestFocus/>
android:id="@+id/loginUsername"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/username"
android:imeOptions="flagNoExtractUi"
android:inputType="textNoSuggestions"
>
<requestFocus/> </android.support.design.widget.TextInputEditText>
</android.support.design.widget.TextInputEditText> </android.support.design.widget.TextInputLayout>
</android.support.design.widget.TextInputLayout> <android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:passwordToggleEnabled="false"
>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputEditText
android:id="@+id/loginPassword"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:passwordToggleEnabled="false" android:hint="@string/password"
> android:imeOptions="flagNoExtractUi"
android:inputType="textPassword"
<android.support.design.widget.TextInputEditText
android:id="@+id/loginPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/password"
android:imeOptions="flagNoExtractUi"
android:inputType="textPassword"
/>
</android.support.design.widget.TextInputLayout>
<Button
android:id="@+id/loginButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:enabled="false"
android:text="@string/login"
/> />
<Button </android.support.design.widget.TextInputLayout>
android:id="@+id/signupButton"
android:layout_width="match_parent" <Button
android:layout_height="wrap_content" android:id="@+id/loginButton"
android:text="@string/signup" android:layout_width="match_parent"
android:layout_gravity="center_horizontal" android:layout_height="wrap_content"
android:onClick="signUp" android:enabled="false"
/> android:text="@string/login"
/>
<Button
android:id="@+id/signupButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:onClick="signUp"
android:text="@string/signup"
/>
</LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>