Skip to content
This repository has been archived by the owner on Jan 29, 2023. It is now read-only.

Commit

Permalink
Resources improvements (#318)
Browse files Browse the repository at this point in the history 
* Get rid of hardcoded sp values

* Get rid of hardcoded dimen values
  • Loading branch information
@vase4kin
vase4kin committed Apr 18, 2020
1 parent 2faf2da commit be3907f
Show file tree
Hide file tree
Showing 56 changed files with 357 additions and 404 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/vase4kin/teamcityapp/app_navigation/BottomNavigationView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class BottomNavigationViewImpl(
}

val elevation =
activity.resources.getDimension(R.dimen.elevation_bottom_navigation)
activity.resources.getDimension(R.dimen.dp_8)
val backgroundColor = ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
activity.getThemeColor(R.attr.colorPrimarySurface), elevation
)
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/github/vase4kin/teamcityapp/buildlist/view/BuildListViewImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ open class BuildListViewImpl(
.setCaptureTouchEventOutsidePrompt(true)
.setPromptFocal(
RectanglePromptFocal().setCornerRadius(
activity.resources.getDimension(R.dimen.default_prompt_fab_radius),
activity.resources.getDimension(R.dimen.default_prompt_fab_radius)
activity.resources.getDimension(R.dimen.dp_38),
activity.resources.getDimension(R.dimen.dp_38)
)
)
.setPromptStateChangeListener { _, state ->
Expand Down Expand Up @@ -390,7 +390,7 @@ open class BuildListViewImpl(

private fun getBackgroundColor(): Int {
val elevation =
activity.resources.getDimension(R.dimen.default_elevation)
activity.resources.getDimension(R.dimen.dp_4)
return ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
activity.getThemeColor(R.attr.colorPrimarySurface), elevation
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/vase4kin/teamcityapp/home/view/HomeViewImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ class HomeViewImpl(private val activity: AppCompatActivity) : HomeView {

private fun getBackgroundColor(): Int {
val elevation =
activity.resources.getDimension(R.dimen.default_elevation)
activity.resources.getDimension(R.dimen.dp_4)
return ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
activity.getThemeColor(R.attr.colorPrimarySurface), elevation
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/vase4kin/teamcityapp/overview/view/OverviewViewImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ class OverviewViewImpl(

private fun getBackgroundColor(): Int {
val elevation =
activity.resources.getDimension(R.dimen.default_elevation)
activity.resources.getDimension(R.dimen.dp_4)
return ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
activity.getThemeColor(R.attr.colorPrimarySurface), elevation
)
Expand Down
10 changes: 7 additions & 3 deletions app/src/main/res/layout/activity_build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,12 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />

<include
style="@style/BaseFloatingActionButton.NotVisible"
layout="@layout/layout_float_button" />
<com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/floating_action_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:visibility="gone"
tools:src="@drawable/ic_add_black_24dp" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_build_list.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/default_margin"
android:layout_margin="@dimen/dp_16"
android:text="@string/title_run_build"
android:visibility="invisible"
app:icon="@drawable/ic_directions_run_white_24px"
Expand Down
32 changes: 16 additions & 16 deletions app/src/main/res/layout/activity_create_account.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
android:id="@+id/teamcity_url_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginTop="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_16"
android:hint="@string/server_field_hint">

<com.github.vase4kin.teamcityapp.login.view.EditTextNoAutofill
Expand All @@ -65,18 +65,18 @@
android:id="@+id/guest_user_switch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginTop="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_16"
android:text="@string/text_guest_user_switch" />

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/user_field_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginTop="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_16"
android:hint="@string/hint_user_name">

<com.github.vase4kin.teamcityapp.login.view.EditTextNoAutofill
Expand All @@ -92,9 +92,9 @@
android:id="@+id/password_field_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginTop="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_16"
android:hint="@string/hint_password">

<com.github.vase4kin.teamcityapp.login.view.EditTextNoAutofill
Expand All @@ -110,10 +110,10 @@
android:id="@+id/disable_ssl_switch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginTop="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginBottom="@dimen/default_margin"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_16"
android:text="@string/text_disable_ssl_switch" />

<include layout="@layout/layout_divider" />
Expand Down
18 changes: 9 additions & 9 deletions app/src/main/res/layout/activity_filter_builds.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
android:layout_margin="@dimen/default_margin"
android:layout_margin="@dimen/dp_16"
android:text="@string/text_apply_filters_button"
app:icon="@drawable/ic_done_24px" />

Expand Down Expand Up @@ -71,23 +71,23 @@
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:orientation="vertical"
android:paddingLeft="@dimen/default_margin"
android:paddingTop="@dimen/padding_switch"
android:paddingRight="@dimen/default_margin"
android:paddingBottom="@dimen/padding_switch">
android:paddingLeft="@dimen/dp_16"
android:paddingTop="@dimen/dp_12"
android:paddingRight="@dimen/dp_16"
android:paddingBottom="@dimen/dp_12">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/text_filters"
android:textColor="@color/material_on_background_emphasis_high_type"
android:textSize="18sp" />
android:textAppearance="?textAppearanceBody1" />

<TextView
android:id="@+id/selected_filter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/text_filters_none"
android:textAppearance="?textAppearanceBody2"
android:textColor="@color/material_on_background_emphasis_medium" />

</LinearLayout>
Expand Down Expand Up @@ -116,9 +116,9 @@

<!--View that makes a view scrollable for low-res devices, to make fab to not overlap the content-->
<View
android:background="?android:attr/colorBackground"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_96dp"/>
android:layout_height="@dimen/dp_96"
android:background="?android:attr/colorBackground" />

</LinearLayout>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:layout_marginEnd="@dimen/default_margin"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="74dp"
android:visibility="gone"
tools:src="@drawable/ic_favorite_white_24dp"
Expand Down
63 changes: 31 additions & 32 deletions app/src/main/res/layout/activity_login.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:fillViewport="true"
android:orientation="vertical"
android:paddingTop="48dp">
android:paddingTop="@dimen/dp_48">

<ImageView
android:layout_width="wrap_content"
Expand All @@ -39,28 +39,27 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/default_margin"
android:layout_marginTop="@dimen/dp_16"
android:text="@string/app_name"
android:textAppearance="?attr/textAppearanceHeadline5" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/small_margin"
android:layout_marginTop="@dimen/dp_8"
android:gravity="center"
android:text="@string/text_app_description"
android:textAppearance="?attr/textAppearanceSubtitle1"
android:textColor="@color/material_on_background_emphasis_medium"
android:textSize="20sp" />
android:textAppearance="?attr/textAppearanceHeadline6"
android:textColor="@color/material_on_background_emphasis_medium" />

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/teamcity_url_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/login_screen_margin"
android:layout_marginTop="@dimen/login_screen_margin"
android:layout_marginRight="@dimen/login_screen_margin"
android:layout_marginLeft="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_24"
android:layout_marginRight="@dimen/dp_24"
android:hint="@string/server_field_hint">

<com.github.vase4kin.teamcityapp.login.view.EditTextNoAutofill
Expand All @@ -76,17 +75,17 @@
android:id="@+id/guest_user_switch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="28dp"
android:layout_marginTop="@dimen/small_margin"
android:layout_marginEnd="@dimen/login_screen_margin"
android:layout_marginStart="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_24"
android:text="@string/text_guest_user_switch" />

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/user_field_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/login_screen_margin"
android:layout_marginRight="@dimen/login_screen_margin"
android:layout_marginLeft="@dimen/dp_24"
android:layout_marginRight="@dimen/dp_24"
android:hint="@string/hint_user_name">

<com.github.vase4kin.teamcityapp.login.view.EditTextNoAutofill
Expand All @@ -102,8 +101,8 @@
android:id="@+id/password_field_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/login_screen_margin"
android:layout_marginRight="@dimen/login_screen_margin"
android:layout_marginLeft="@dimen/dp_24"
android:layout_marginRight="@dimen/dp_24"
android:hint="@string/hint_password">

<com.github.vase4kin.teamcityapp.login.view.EditTextNoAutofill
Expand All @@ -119,34 +118,34 @@
android:id="@+id/disable_ssl_switch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="28dp"
android:layout_marginTop="@dimen/small_margin"
android:layout_marginEnd="@dimen/login_screen_margin"
android:layout_marginStart="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_24"
android:text="@string/text_disable_ssl_switch" />

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_login"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/login_screen_margin"
android:layout_margin="@dimen/dp_24"
android:text="@string/text_login_button" />

<ProgressBar
android:id="@+id/give_it_a_try_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="@dimen/login_screen_margin"
android:layout_marginBottom="@dimen/dp_24"
android:visibility="gone"
tools:visibility="visible" />

<com.google.android.material.card.MaterialCardView
android:id="@+id/give_it_a_try_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/login_screen_margin"
android:layout_marginRight="@dimen/login_screen_margin"
android:layout_marginBottom="@dimen/login_screen_margin"
android:layout_marginLeft="@dimen/dp_24"
android:layout_marginRight="@dimen/dp_24"
android:layout_marginBottom="@dimen/dp_24"
android:visibility="gone"
tools:visibility="visible">

Expand All @@ -156,9 +155,9 @@

<ImageView
android:id="@+id/imageView"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_margin="@dimen/default_margin"
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"
android:layout_margin="@dimen/dp_16"
app:layout_constraintBottom_toBottomOf="@id/text"
app:layout_constraintEnd_toStartOf="@id/text"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -168,10 +167,10 @@

<TextView
android:id="@+id/text"
android:layout_width="0dp"
android:layout_width="@dimen/dp_0"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:gravity="start"
android:text="@string/text_try_it_out"
android:textAppearance="?attr/textAppearanceSubtitle1"
Expand All @@ -185,8 +184,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="@dimen/small_margin"
android:layout_marginEnd="@dimen/default_margin"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_16"
android:text="@string/text_button_try_it_out"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/text" />
Expand Down

0 comments on commit be3907f

Please sign in to comment.