王鹏鹏 преди 2 години
родител
ревизия
2c3f6ff7c1
променени са 3 файла, в които са добавени 54 реда и са изтрити 61 реда
  1. 31 61
      home/src/main/res/layout/activity_home.xml
  2. 1 0
      home/src/main/res/values/dimens.xml
  3. 22 0
      home/src/main/res/values/themes.xml

+ 31 - 61
home/src/main/res/layout/activity_home.xml

@@ -47,7 +47,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_61px"
                         android:layout_marginStart="@dimen/divider_101px"
-                        android:layout_marginTop="@dimen/divider_46px"
+                        android:layout_marginTop="@dimen/divider_30px"
                         android:layout_marginEnd="@dimen/divider_31px"
                         android:background="@drawable/bg_home_title"
                         android:gravity="center"
@@ -308,8 +308,7 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/tvPlayPorpoise"
-                    android:layout_width="@dimen/divider_265px"
-                    android:layout_height="@dimen/divider_188px"
+                    style="@style/home_right_tools_layout"
                     android:background="@drawable/bg_play_porpoise"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toLeftOf="@id/tvProfessionalEvaluation"
@@ -327,22 +326,16 @@
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/divider_9px"
+                        style="@style/home_right_tools_text"
                         android:text="@string/play_with_blue_porpoise"
-                        android:textColor="@android:color/white"
-                        android:textSize="@dimen/divider_28px"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/enjoyImage" />
+                        app:layout_constraintTop_toBottomOf="@+id/enjoyImage"
+                        tools:ignore="MissingConstraints" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/tvProfessionalEvaluation"
-                    android:layout_width="@dimen/divider_265px"
-                    android:layout_height="@dimen/divider_188px"
+                    style="@style/home_right_tools_layout"
                     android:background="@drawable/bg_professional_evaluation"
                     app:layout_constraintLeft_toRightOf="@id/tvPlayPorpoise"
                     app:layout_constraintRight_toRightOf="parent"
@@ -350,32 +343,24 @@
 
                     <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/evaluationImage"
-                        android:layout_width="@dimen/divider_57px"
-                        android:layout_height="@dimen/divider_57px"
+                        style="@style/home_right_tools_image"
+                        android:layout_width="@dimen/divider_77px"
+                        android:layout_height="@dimen/divider_77px"
                         android:layout_marginTop="@dimen/divider_32px"
                         android:background="@mipmap/icon_evaluation"
-                        android:scaleType="centerInside"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        tools:ignore="MissingConstraints" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/divider_9px"
+                        style="@style/home_right_tools_text"
                         android:text="@string/professional_evaluation"
-                        android:textColor="@android:color/white"
-                        android:textSize="@dimen/divider_28px"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/evaluationImage" />
+                        app:layout_constraintTop_toBottomOf="@+id/evaluationImage"
+                        tools:ignore="MissingConstraints" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/tvHealthCounseling"
-                    android:layout_width="@dimen/divider_265px"
-                    android:layout_height="@dimen/divider_188px"
+                    style="@style/home_right_tools_layout"
                     android:layout_marginTop="@dimen/divider_28px"
                     android:background="@drawable/bg_health_counseling"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -384,32 +369,24 @@
 
                     <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/newsInformationImage"
-                        android:layout_width="@dimen/divider_57px"
-                        android:layout_height="@dimen/divider_57px"
-                        android:layout_marginTop="@dimen/divider_47px"
+                        style="@style/home_right_tools_image"
+                        android:layout_width="@dimen/divider_80px"
+                        android:layout_height="@dimen/divider_79px"
+                        android:layout_marginTop="@dimen/divider_27px"
                         android:background="@mipmap/icon_news_information"
-                        android:scaleType="centerInside"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        tools:ignore="MissingConstraints" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/divider_9px"
+                        style="@style/home_right_tools_text"
                         android:text="@string/health_counseling"
-                        android:textColor="@android:color/white"
-                        android:textSize="@dimen/divider_28px"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/newsInformationImage" />
+                        app:layout_constraintTop_toBottomOf="@+id/newsInformationImage"
+                        tools:ignore="MissingConstraints" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/tvfunTime"
-                    android:layout_width="@dimen/divider_265px"
-                    android:layout_height="@dimen/divider_188px"
+                    style="@style/home_right_tools_layout"
                     android:layout_marginTop="@dimen/divider_28px"
                     android:background="@drawable/bg_fun_time"
                     android:gravity="center"
@@ -419,25 +396,18 @@
 
                     <androidx.appcompat.widget.AppCompatImageView
                         android:id="@+id/funTimeImage"
-                        android:layout_width="@dimen/divider_57px"
-                        android:layout_height="@dimen/divider_57px"
-                        android:layout_marginTop="@dimen/divider_47px"
+                        style="@style/home_right_tools_image"
+                        android:layout_width="@dimen/divider_95px"
+                        android:layout_height="@dimen/divider_76px"
+                        android:layout_marginTop="@dimen/divider_32px"
                         android:background="@mipmap/icon_fun_time"
-                        android:scaleType="centerInside"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        tools:ignore="MissingConstraints" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/divider_9px"
+                        style="@style/home_right_tools_text"
                         android:text="@string/fun_time"
-                        android:textColor="@android:color/white"
-                        android:textSize="@dimen/divider_28px"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/funTimeImage" />
+                        app:layout_constraintTop_toBottomOf="@+id/funTimeImage"
+                        tools:ignore="MissingConstraints" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 

+ 1 - 0
home/src/main/res/values/dimens.xml

@@ -79,6 +79,7 @@
     <dimen name="divider_102px" tools:ignore="ResourceName">102px</dimen>
     <dimen name="divider_101px" tools:ignore="ResourceName">101px</dimen>
     <dimen name="divider_100px" tools:ignore="ResourceName">100px</dimen>
+    <dimen name="divider_95px" tools:ignore="ResourceName">95px</dimen>
     <dimen name="divider_88px" tools:ignore="ResourceName">88px</dimen>
     <dimen name="divider_82px" tools:ignore="ResourceName">82px</dimen>
     <dimen name="divider_81px" tools:ignore="ResourceName">81px</dimen>

+ 22 - 0
home/src/main/res/values/themes.xml

@@ -18,4 +18,26 @@
         <item name="android:layout_gravity">center_horizontal</item>
     </style>
 
+    <style name="home_right_tools_layout" tools:ignore="ResourceName">
+        <item name="android:layout_width">@dimen/divider_265px</item>
+        <item name="android:layout_height">@dimen/divider_188px</item>
+    </style>
+
+    <style name="home_right_tools_image" tools:ignore="ResourceName">
+        <item name="layout_constraintLeft_toLeftOf">parent</item>
+        <item name="layout_constraintRight_toRightOf">parent</item>
+        <item name="layout_constraintTop_toTopOf">parent</item>
+        <item name="android:scaleType">centerInside</item>
+    </style>
+
+    <style name="home_right_tools_text" tools:ignore="ResourceName">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/divider_9px</item>
+        <item name="android:textSize">@dimen/divider_28px</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="layout_constraintLeft_toLeftOf">parent</item>
+        <item name="layout_constraintRight_toRightOf">parent</item>
+    </style>
+
 </resources>