Skip to content

Commit

Permalink
- Added new dimens
Browse files Browse the repository at this point in the history 
- Changed App colors
- Added art
  • Loading branch information
m.nageh committed Nov 25, 2019
1 parent 497cb1c commit 920d7cf
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 34 deletions.
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_camera.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/newWeatherPhotoBtn"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"
android:layout_marginBottom="@dimen/dp_16"
android:background="@drawable/btn_photo"
android:paddingStart="@dimen/dp_16"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/item_weather_photo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

<ImageView
android:id="@+id/weatherPhotoIv"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"
android:contentDescription="@string/movie_image"
android:scaleType="centerCrop"
app:displayPhoto="@{weatherPhoto.photoPath}"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/item_weather_placeholder.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

<ImageView
android:id="@+id/weatherPhotoIv"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_width="@dimen/dp_80"
android:layout_height="@dimen/dp_80"
android:contentDescription="@string/movie_image"
android:scaleType="centerCrop"
android:transitionName="@string/weather_photo"
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/values-hdpi/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
<dimen name="dp_32">24dp</dimen>
<dimen name="sp_18">13.5sp</dimen>
<dimen name="sp_14">10.5sp</dimen>
<dimen name="nav_profile_img_width">45.0dp</dimen>
<dimen name="nav_profile_img_height">45.0dp</dimen>
<dimen name="dp_2">1.5dp</dimen>
<dimen name="dp_80">65.0dp</dimen>
<dimen name="dp_2">1.5dp</dimen>
<dimen name="sp_16">12.0sp</dimen>
<dimen name="article_image_height">150.0dp</dimen>
<dimen name="dp_4">3.0dp</dimen>
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/values-mdpi/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
<dimen name="dp_32">16dp</dimen>
<dimen name="sp_18">9.0sp</dimen>
<dimen name="sp_14">7.0sp</dimen>
<dimen name="nav_profile_img_width">30.0dp</dimen>
<dimen name="nav_profile_img_height">30.0dp</dimen>
<dimen name="dp_2">1.0dp</dimen>
<dimen name="dp_80">40.0dp</dimen>
<dimen name="dp_2">1.0dp</dimen>
<dimen name="sp_16">8.0sp</dimen>
<dimen name="article_image_height">100.0dp</dimen>
<dimen name="dp_4">2.0dp</dimen>
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/values-xhdpi/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
<dimen name="dp_32">32dp</dimen>
<dimen name="sp_18">18.0sp</dimen>
<dimen name="sp_14">14.0sp</dimen>
<dimen name="nav_profile_img_width">60.0dp</dimen>
<dimen name="nav_profile_img_height">60.0dp</dimen>
<dimen name="dp_2">2.0dp</dimen>
<dimen name="dp_80">80.0dp</dimen>
<dimen name="dp_2">2.0dp</dimen>
<dimen name="sp_16">16.0sp</dimen>
<dimen name="article_image_height">200.0dp</dimen>
<dimen name="dp_4">4.0dp</dimen>
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/values-xxhdpi/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
<dimen name="dp_16">16.0dp</dimen>
<dimen name="sp_18">18.0sp</dimen>
<dimen name="sp_14">14.0sp</dimen>
<dimen name="nav_profile_img_width">60.0dp</dimen>
<dimen name="nav_profile_img_height">60.0dp</dimen>
<dimen name="dp_2">2.0dp</dimen>
<dimen name="dp_80">80.0dp</dimen>
<dimen name="dp_2">2.0dp</dimen>
<dimen name="sp_16">16.0sp</dimen>
<dimen name="article_image_height">200.0dp</dimen>
<dimen name="dp_4">4.0dp</dimen>
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/values-xxxhdpi/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
<dimen name="dp_16">16.0dp</dimen>
<dimen name="sp_18">18.0sp</dimen>
<dimen name="sp_14">14.0sp</dimen>
<dimen name="nav_profile_img_width">60.0dp</dimen>
<dimen name="nav_profile_img_height">60.0dp</dimen>
<dimen name="dp_2">2.0dp</dimen>
<dimen name="dp_80">80.0dp</dimen>
<dimen name="dp_2">2.0dp</dimen>
<dimen name="sp_16">16.0sp</dimen>
<dimen name="article_image_height">200.0dp</dimen>
<dimen name="dp_4">4.0dp</dimen>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#26a69a</color>
<color name="colorPrimaryDark">#00766c</color>
<color name="colorAccent">#f1bd18</color>
<color name="colorPrimary">#263238</color>
<color name="colorPrimaryDark">#000a12</color>
<color name="colorAccent">#4f5b62</color>
<color name="palegreen">#98FB98</color>
<color name="colorPrimaryText">@color/white</color>
<color name="colorSecondaryText">@color/grey</color>
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/values/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<dimen name="dp_16">16dp</dimen>
<dimen name="sp_18">18sp</dimen>
<dimen name="sp_14">14sp</dimen>
<dimen name="nav_profile_img_width">60dp</dimen>
<dimen name="nav_profile_img_height">60dp</dimen>
<dimen name="dp_80">80dp</dimen>
<dimen name="dp_2">2dp</dimen>
<dimen name="sp_16">16sp</dimen>
<dimen name="article_image_height">200dp</dimen>
Expand Down
8 changes: 0 additions & 8 deletions app/src/main/res/values/drawables.xml
View file

This file was deleted.

Binary file added art/device-2019-11-25-122956.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added art/device-2019-11-25-123221.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added art/device-2019-11-25-123510.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added art/device-2019-11-25-123547.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added art/device-2019-11-25-123708.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 920d7cf

Please sign in to comment.