Преглед на файлове

1.修改初次登陆引导页弹窗UI

王鹏鹏 преди 2 години
родител
ревизия
895fd9fdf0

+ 2 - 3
home/src/main/java/com/yingyangfly/home/component/ShowFunTimeViewComponent.java

@@ -14,8 +14,7 @@ public class ShowFunTimeViewComponent implements Component {
 
     @Override
     public View getView(LayoutInflater inflater) {
-        LinearLayout ll = (LinearLayout) inflater.inflate(R.layout.layout_fun_time, null);
-        return ll;
+        return (LinearLayout) inflater.inflate(R.layout.layout_fun_time, null);
     }
 
     @Override
@@ -35,6 +34,6 @@ public class ShowFunTimeViewComponent implements Component {
 
     @Override
     public int getYOffset() {
-        return 10;
+        return 50;
     }
 }

+ 2 - 3
home/src/main/java/com/yingyangfly/home/component/ShowHealthCounselingViewComponent.java

@@ -14,8 +14,7 @@ public class ShowHealthCounselingViewComponent implements Component {
 
     @Override
     public View getView(LayoutInflater inflater) {
-        LinearLayout ll = (LinearLayout) inflater.inflate(R.layout.layout_health_counseling, null);
-        return ll;
+        return (LinearLayout) inflater.inflate(R.layout.layout_health_counseling, null);
     }
 
     @Override
@@ -35,6 +34,6 @@ public class ShowHealthCounselingViewComponent implements Component {
 
     @Override
     public int getYOffset() {
-        return 10;
+        return 50;
     }
 }

+ 2 - 3
home/src/main/java/com/yingyangfly/home/component/ShowPlayPorpoiseViewComponent.java

@@ -14,8 +14,7 @@ public class ShowPlayPorpoiseViewComponent implements Component {
 
     @Override
     public View getView(LayoutInflater inflater) {
-        LinearLayout ll = (LinearLayout) inflater.inflate(R.layout.layout_play_with_blue_porpoise, null);
-        return ll;
+        return (LinearLayout) inflater.inflate(R.layout.layout_play_with_blue_porpoise, null);
     }
 
     @Override
@@ -35,6 +34,6 @@ public class ShowPlayPorpoiseViewComponent implements Component {
 
     @Override
     public int getYOffset() {
-        return 10;
+        return 30;
     }
 }

+ 2 - 3
home/src/main/java/com/yingyangfly/home/component/ShowProfessionalEvaluationViewComponent.java

@@ -14,8 +14,7 @@ public class ShowProfessionalEvaluationViewComponent implements Component {
 
     @Override
     public View getView(LayoutInflater inflater) {
-        LinearLayout ll = (LinearLayout) inflater.inflate(R.layout.layout_professional_evaluation, null);
-        return ll;
+        return (LinearLayout) inflater.inflate(R.layout.layout_professional_evaluation, null);
     }
 
     @Override
@@ -35,6 +34,6 @@ public class ShowProfessionalEvaluationViewComponent implements Component {
 
     @Override
     public int getYOffset() {
-        return 10;
+        return 60;
     }
 }

+ 2 - 2
home/src/main/res/layout/layout_fun_time.xml

@@ -6,8 +6,8 @@
     tools:ignore="ResourceName">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="@dimen/divider_525px"
-        android:layout_height="@dimen/divider_253px"
+        android:layout_width="@dimen/divider_503px"
+        android:layout_height="@dimen/divider_333px"
         android:background="@mipmap/icon_bg_fun_time"
         android:scaleType="centerInside" />
 

+ 2 - 2
home/src/main/res/layout/layout_health_counseling.xml

@@ -6,8 +6,8 @@
     tools:ignore="ResourceName">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="@dimen/divider_525px"
-        android:layout_height="@dimen/divider_253px"
+        android:layout_width="@dimen/divider_503px"
+        android:layout_height="@dimen/divider_333px"
         android:background="@mipmap/icon_health_counseling"
         android:scaleType="centerInside" />
 

+ 1 - 1
home/src/main/res/layout/layout_play_with_blue_porpoise.xml

@@ -7,7 +7,7 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="@dimen/divider_525px"
-        android:layout_height="@dimen/divider_253px"
+        android:layout_height="@dimen/divider_285px"
         android:background="@mipmap/icon_play_with_blue_porpoise"
         android:scaleType="centerInside" />
 

+ 2 - 2
home/src/main/res/layout/layout_professional_evaluation.xml

@@ -6,8 +6,8 @@
     tools:ignore="ResourceName">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="@dimen/divider_525px"
-        android:layout_height="@dimen/divider_253px"
+        android:layout_width="@dimen/divider_503px"
+        android:layout_height="@dimen/divider_363px"
         android:background="@mipmap/icon_professional_evaluation"
         android:scaleType="centerInside" />
 

BIN
home/src/main/res/mipmap-xxhdpi/icon_bg_fun_time.png


BIN
home/src/main/res/mipmap-xxhdpi/icon_health_counseling.png


BIN
home/src/main/res/mipmap-xxhdpi/icon_play_with_blue_porpoise.png


BIN
home/src/main/res/mipmap-xxhdpi/icon_professional_evaluation.png


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

@@ -7,6 +7,7 @@
     <dimen name="divider_561px" tools:ignore="ResourceName">561px</dimen>
     <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
     <dimen name="divider_525px" tools:ignore="ResourceName">525px</dimen>
+    <dimen name="divider_503px" tools:ignore="ResourceName">503px</dimen>
     <dimen name="divider_443px" tools:ignore="ResourceName">443px</dimen>
     <dimen name="divider_440px" tools:ignore="ResourceName">440px</dimen>
     <dimen name="divider_432px" tools:ignore="ResourceName">432px</dimen>
@@ -18,6 +19,7 @@
     <dimen name="divider_409px" tools:ignore="ResourceName">409px</dimen>
     <dimen name="divider_404px" tools:ignore="ResourceName">404px</dimen>
     <dimen name="divider_377px" tools:ignore="ResourceName">377px</dimen>
+    <dimen name="divider_363px" tools:ignore="ResourceName">363px</dimen>
     <dimen name="divider_354px" tools:ignore="ResourceName">354px</dimen>
     <dimen name="divider_348px" tools:ignore="ResourceName">348px</dimen>
     <dimen name="divider_345px" tools:ignore="ResourceName">345px</dimen>
@@ -33,6 +35,7 @@
     <dimen name="divider_313px" tools:ignore="ResourceName">313px</dimen>
     <dimen name="divider_307px" tools:ignore="ResourceName">307px</dimen>
     <dimen name="divider_289px" tools:ignore="ResourceName">289px</dimen>
+    <dimen name="divider_285px" tools:ignore="ResourceName">285px</dimen>
     <dimen name="divider_270px" tools:ignore="ResourceName">270px</dimen>
     <dimen name="divider_265px" tools:ignore="ResourceName">265px</dimen>
     <dimen name="divider_264px" tools:ignore="ResourceName">264px</dimen>