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

Initial pass to use standard margins/padding (in dimens.xml)

Browse source
This commit is contained in:
Paul Hawke 2017-12-22 15:24:30 -06:00
parent ed42194362
commit d9d174398d
31 changed files with 349 additions and 349 deletions
Download patch file Download diff file Expand all files Collapse all files

111
app/src/main/res/layout-land/activity_login.xml
View file

@ -8,17 +8,17 @@
android:layout_width="400sp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="8dp">
android:layout_marginTop="@dimen/small_gap">
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="@dimen/large_gap"
android:layout_marginBottom="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
app:cardCornerRadius="4dp"
app:cardElevation="4dp">
@ -34,11 +34,11 @@
android:layout_height="wrap_content"
android:background="@color/primaryColor"
android:gravity="center"
android:paddingBottom="32dp"
android:paddingTop="32dp"
android:paddingBottom="@dimen/large_gap"
android:paddingTop="@dimen/large_gap"
android:text="@string/login_to_your_account"
android:textColor="@android:color/white"
android:textSize="24sp" />
android:textSize="@dimen/heading_text_size" />
<FrameLayout
android:id="@+id/error_message_container"
@ -52,12 +52,12 @@
android:id="@+id/error_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:paddingBottom="8dp"
android:paddingTop="8dp"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:paddingBottom="@dimen/small_gap"
android:paddingTop="@dimen/small_gap"
android:textColor="@color/secondaryDarkColor"
tools:text="Check your password, something doesnt look right" />
</FrameLayout>
@ -67,12 +67,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/error_message_container"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp">
android:layout_marginBottom="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:layout_marginTop="@dimen/standard_gap">
<android.support.design.widget.TextInputEditText
android:id="@+id/loginUsername"
@ -93,11 +93,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/username_container"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginBottom="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
app:passwordToggleEnabled="false">
<android.support.design.widget.TextInputEditText
@ -115,11 +115,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/password_container"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginBottom="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:visibility="gone"
app:passwordToggleEnabled="false"
tools:visibility="visible">
@ -141,11 +141,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/two_factor_container"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp">
android:layout_marginBottom="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap">
<Button
android:id="@+id/signupButton"
@ -153,8 +153,8 @@
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="@dimen/small_gap"
android:layout_marginRight="@dimen/small_gap"
android:layout_weight="1"
android:text="@string/signup" />
@ -163,35 +163,24 @@
android:layout_width="0dp"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginLeft="@dimen/small_gap"
android:layout_marginStart="@dimen/small_gap"
android:layout_weight="1"
android:enabled="false"
android:text="@string/login" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_privacy_policy"
style="?android:textAppearanceSmall"
android:layout_below="@id/buttonFrame"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp">
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_privacy_policy"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_gravity="center_horizontal"
android:text="@string/about_privacy_policy"
android:layout_centerHorizontal="true"/>
</RelativeLayout>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/standard_gap"
android:layout_gravity="center_horizontal"
android:text="@string/about_privacy_policy"
android:layout_centerHorizontal="true"/>
</RelativeLayout>
</android.support.v7.widget.CardView>

11
app/src/main/res/layout-land/welcome_do_upload.xml
View file

@ -5,16 +5,15 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#0c609c"
android:gravity="center"
>
android:gravity="center">
<GridLayout
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:columnCount="2"
>
@ -69,8 +68,8 @@
android:text="@string/tutorial_2_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textSize="@dimen/normal_text"
android:textAlignment="center"
android:paddingTop="24dp"
android:gravity="center_horizontal"
android:textColor="@android:color/white"/>
@ -81,7 +80,7 @@
android:text="@string/tutorial_2_subtext"
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="16dp"
android:paddingTop="@dimen/standard_gap"
android:gravity="start"
android:textColor="@android:color/white"
/>

15
app/src/main/res/layout-land/welcome_dont_upload.xml
View file

@ -12,24 +12,25 @@
android:layout_gravity="center"
android:layout_width="240dp"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_marginLeft="10dp"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
>
<ImageView
android:src="@drawable/selfie_x"
android:id="@+id/selfie_x"
android:layout_width="110dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:contentDescription="@string/welcome_image_no_selfies"
/>
<ImageView
android:src="@drawable/proprietary_x"
android:id="@+id/proprietary_x"
android:layout_marginLeft="10dp"
android:layout_marginStart="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_width="110dp"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_toRightOf="@+id/selfie_x"
android:contentDescription="@string/welcome_image_proprietary"
/>
@ -50,7 +51,7 @@
android:layout_gravity="center"
android:textStyle="bold"
android:textAlignment="center"
android:paddingTop="24dp"
android:textSize="@dimen/normal_text"
android:gravity="center_horizontal"
android:textColor="@android:color/white"/>
@ -61,7 +62,7 @@
android:text="@string/tutorial_3_subtext"
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="16dp"
android:paddingTop="@dimen/standard_gap"
android:gravity="start"
android:textColor="@android:color/white"
/>

5
app/src/main/res/layout-land/welcome_final.xml
View file

@ -43,14 +43,15 @@
android:text="@string/welcome_final_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textSize="@dimen/normal_text"
android:textAlignment="center"
android:gravity="center_horizontal"
android:textColor="@android:color/white"/>
<Button
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_marginTop="16dp"
android:layout_height="@dimen/overflow_button_dimen"
android:layout_marginTop="@dimen/standard_gap"
android:text="@string/welcome_final_button_text"
android:id="@+id/welcomeYesButton"
android:layout_gravity="center"

12
app/src/main/res/layout-land/welcome_image_details.xml
View file

@ -12,10 +12,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/sydney_opera_house"
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:paddingTop="24dp"
android:paddingBottom="24dp"
android:paddingLeft="@dimen/large_gap"
android:paddingRight="@dimen/standard_gap"
android:paddingTop="@dimen/large_gap"
android:paddingBottom="@dimen/large_gap"
android:adjustViewBounds="true"
android:layout_gravity="center"
android:contentDescription="@string/welcome_image_sydney_opera_house"
@ -34,7 +34,7 @@
android:layout_gravity="center"
android:textStyle="bold"
android:textAlignment="center"
android:paddingTop="24dp"
android:textSize="@dimen/normal_text"
android:gravity="center_horizontal"
android:textColor="@android:color/white"/>
@ -45,7 +45,7 @@
android:text="@string/tutorial_4_subtext"
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="16dp"
android:paddingTop="@dimen/standard_gap"
android:gravity="start"
android:textColor="@android:color/white"
/>

6
app/src/main/res/layout-land/welcome_wikipedia.xml
View file

@ -13,6 +13,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/welcome_wikipedia"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:adjustViewBounds="true"
android:contentDescription="@string/welcome_image_welcome_wikipedia"
/>
@ -29,8 +31,8 @@
android:text="@string/tutorial_1_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textSize="@dimen/normal_text"
android:textAlignment="center"
android:paddingTop="24dp"
android:gravity="center_horizontal"
android:textColor="@android:color/white"/>
@ -41,7 +43,7 @@
android:text="@string/tutorial_1_subtext"
android:layout_gravity="center"
android:textAlignment="center"
android:paddingTop="16dp"
android:paddingTop="@dimen/standard_gap"
android:gravity="center_horizontal"
android:textColor="@android:color/white"
/>