Skip to content

I extracted dimension values into resource files #1151. #1219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
veritaslogix wants to merge 2 commits into
base: master
Choose a base branch
from
Open

I extracted dimension values into resource files #1151. #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
159494f
I extracted dimension values into resource files #1151.
Sep 27, 2021
7961610
Merge branch 'lbryio:master' into master
veritaslogix Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions app/src/main/res/layout/activity_first_run.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
android:id="@+id/welcome_wait_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="24dp"
android:padding="@dimen/normal_03"
android:visibility="gone">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true">
<ProgressBar
android:id="@+id/welcome_progress_bar"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:layout_width="@dimen/normal_03"
android:layout_height="@dimen/normal_03"
android:layout_marginEnd="@dimen/small_08"
android:layout_gravity="center_vertical"/>
<TextView
android:id="@+id/welcome_wait_text"
Expand All @@ -43,7 +43,7 @@
android:id="@+id/welcome_link_use_lbry"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:padding="16dp"
android:padding="@dimen/normal_01"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
Expand All @@ -68,34 +68,34 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:padding="24dp">
android:padding="@dimen/normal_03">
<TextView
android:fontFamily="@font/inter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/welcome_to_lbry"
android:textColor="@color/white"
android:textSize="32sp" />
android:textSize="@dimen/text_size_14" />
<TextView
android:fontFamily="@font/inter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/welcome_paragraph"
android:textColor="@color/white"
android:layout_marginTop="16dp"
android:layout_marginTop="@dimen/normal_01"
android:textFontWeight="300"
android:textSize="16sp" />
android:textSize="@dimen/text_size_06" />
<TextView
android:id="@+id/welcome_text_view_tos"
android:fontFamily="@font/inter"
android:layout_marginTop="48dp"
android:layout_marginTop="@dimen/normal_09"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:linksClickable="true"
android:text="@string/welcome_tos"
android:textColor="@color/white"
android:textFontWeight="300"
android:textSize="12sp" />
android:textSize="@dimen/text_size_02" />
</LinearLayout>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/res/layout/activity_verification.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,26 @@
<RelativeLayout
android:id="@+id/verification_close_button"
android:visibility="gone"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="8dp"
android:layout_width="@dimen/normal_06"
android:layout_height="@dimen/normal_06"
android:layout_marginEnd="@dimen/small_08"
android:layout_marginTop="@dimen/small_08"
android:background="?attr/selectableItemBackground"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent">
<ImageView
android:layout_centerInParent="true"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_width="@dimen/normal_03"
android:layout_height="@dimen/normal_03"
android:src="@drawable/ic_close"
app:tint="@color/white" />
</RelativeLayout>

<ProgressBar
android:id="@+id/verification_loading_progress"
android:visibility="gone"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_width="@dimen/normal_06"
android:layout_height="@dimen/normal_06"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
Expand Down
54 changes: 27 additions & 27 deletions app/src/main/res/layout/app_bar_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,33 +34,33 @@
android:background="@android:color/transparent"
android:layout_centerVertical="true"
android:drawableStart="@drawable/ic_search"
android:drawablePadding="8dp"
android:drawablePadding="@dimen/small_08"
android:drawableTint="@color/actionBarForeground"
android:fontFamily="@font/inter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:layout_marginEnd="@dimen/normal_03"
android:hint="@string/uri_placeholder"
android:imeOptions="actionGo"
android:inputType="textNoSuggestions"
android:paddingEnd="36dp"
android:paddingEnd="@dimen/normal_06"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textFontWeight="300"
android:textSize="14sp" />
android:textSize="@dimen/text_size_04" />
<LinearLayout
android:id="@+id/wunderbar_close"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:layout_marginEnd="@dimen/normal_03"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:visibility="gone">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_width="@dimen/normal_03"
android:layout_height="@dimen/normal_03"
android:src="@drawable/ic_close"
app:tint="@color/actionBarForeground" />
</LinearLayout>
Expand All @@ -69,14 +69,14 @@
android:id="@+id/wunderbar_notifications"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:layout_width="48dp"
android:layout_width="@dimen/normal_09"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true">
<ImageView
android:id="@+id/notifications_toggle_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_width="@dimen/normal_03"
android:layout_height="@dimen/normal_03"
android:layout_centerInParent="true"
android:src="@drawable/ic_notifications"
app:tint="@color/actionBarForeground" />
Expand All @@ -87,13 +87,13 @@
android:background="@drawable/bg_notification_badge"
android:fontFamily="@font/inter"
android:gravity="center_horizontal"
android:minWidth="12dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginTop="12dp"
android:layout_marginStart="24dp"
android:minWidth="@dimen/small_12"
android:paddingStart="@dimen/small_02"
android:paddingEnd="@dimen/small_02"
android:layout_marginTop="@dimen/small_12"
android:layout_marginStart="@dimen/normal_03"
android:textColor="@color/white"
android:textSize="10sp"
android:textSize="@dimen/text_size_00"
android:visibility="invisible"
/>
</RelativeLayout>
Expand Down Expand Up @@ -124,13 +124,13 @@
android:layout_height="wrap_content"
android:text="@string/app_name"
android:fontFamily="@font/inter"
android:textSize="56sp"
android:textSize="@dimen/text_size_16"
android:textStyle="bold" />
<ProgressBar
android:layout_gravity="center_horizontal"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="48dp" />
android:layout_width="@dimen/normal_03"
android:layout_height="@dimen/normal_03"
android:layout_marginTop="@dimen/normal_09" />
</LinearLayout>
<LinearLayout
android:id="@+id/splash_view_error_container"
Expand All @@ -139,30 +139,30 @@
android:layout_centerVertical="true"
android:orientation="vertical"
android:visibility="gone"
android:padding="24dp">
android:padding="@dimen/normal_03">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:text="@string/oops_something_went_wrong"
android:textSize="20sp"
android:textSize="@dimen/text_size_10"
android:textColor="@color/white" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:layout_marginTop="8dp"
android:layout_marginTop="@dimen/small_08"
android:text="@string/startup_failed"
android:textColor="@color/white"
android:textFontWeight="300"
android:textSize="14sp" />
android:textSize="@dimen/text_size_04" />
<ListView
android:id="@+id/startup_stage_error_listview"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="12dp"
android:layout_height="@dimen/small_00"
android:layout_marginTop="@dimen/small_12"
android:divider="@android:color/transparent"
android:dividerHeight="8dp"
android:dividerHeight="@dimen/small_08"
android:scrollbars="none"
tools:listitem="@layout/list_item_startupstage">

Expand Down
22 changes: 11 additions & 11 deletions app/src/main/res/layout/card_invites_by_email.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,52 @@
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp">
android:layout_marginBottom="@dimen/normal_01">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
android:padding="@dimen/normal_01">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:layout_marginBottom="@dimen/small_12"
android:fontFamily="@font/inter"
android:textStyle="bold"
android:text="@string/invite_by_email"
android:textSize="20sp"/>
android:textSize="@dimen/text_size_10"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:text="@string/invite_someone"
android:textSize="14sp"
android:textSize="@dimen/text_size_04"
android:textFontWeight="300" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/invites_email_input_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp">
android:layout_marginTop="@dimen/normal_01">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/invites_email_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:hint="@string/invite_email_placeholder"
android:textSize="14sp"
android:textSize="@dimen/text_size_04"
android:textFontWeight="300" />
</com.google.android.material.textfield.TextInputLayout>

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp">
android:layout_marginTop="@dimen/normal_01">
<ProgressBar
android:id="@+id/invites_loading_invite_by_email_progress"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="@dimen/normal_02"
android:layout_height="@dimen/normal_02"
android:layout_centerVertical="true"
android:layout_marginEnd="24dp"
android:layout_marginEnd="@dimen/normal_03"
android:layout_toStartOf="@id/invites_email_button"
android:visibility="gone" />
<com.google.android.material.button.MaterialButton
Expand Down
Loading