Browse Source

no message

master
lh 8 years ago
parent
commit
92c713aecb
4 changed files with 67 additions and 55 deletions
  1. +33
    -22
      app/src/main/res/layout/item_dailydetail.xml
  2. +21
    -21
      app/src/main/res/layout/item_productiondailydetail.xml
  3. +12
    -12
      app/src/main/res/layout/lv_header.xml
  4. +1
    -0
      app/src/main/res/values/colors.xml

+ 33
- 22
app/src/main/res/layout/item_dailydetail.xml View File

@ -23,15 +23,16 @@
android:layout_height="wrap_content"
android:text="@string/buildinghomes1"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView
android:id="@+id/dailyd_buildinghome"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:padding="@dimen/dp_5"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -48,17 +49,19 @@
android:layout_height="wrap_content"
android:text="@string/dayage1"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<EditText
android:id="@+id/dailyd_dayage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:inputType="number"
android:maxLines="1"
android:padding="@dimen/dp_5"
android:background="@drawable/shape_bg"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -76,18 +79,18 @@
android:layout_height="wrap_content"
android:text="@string/survival"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView
android:id="@+id/production_info_survival"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
<!--<include layout="@layout/include_line" />-->
<LinearLayout
android:layout_width="match_parent"
@ -101,17 +104,19 @@
android:layout_height="wrap_content"
android:text="@string/death1"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<EditText
android:id="@+id/dailyd_death"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:inputType="number"
android:background="@drawable/shape_bg"
android:maxLines="1"
android:padding="@dimen/dp_5"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -128,17 +133,19 @@
android:layout_height="wrap_content"
android:text="@string/eliminate"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<EditText
android:id="@+id/dailyd_eliminate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:inputType="number"
android:padding="@dimen/dp_5"
android:background="@drawable/shape_bg"
android:maxLines="1"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -155,17 +162,19 @@
android:layout_height="wrap_content"
android:text="@string/water"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<EditText
android:id="@+id/dailyd_water"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:inputType="numberDecimal"
android:maxLines="1"
android:padding="@dimen/dp_5"
android:background="@drawable/shape_bg"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -182,17 +191,19 @@
android:layout_height="wrap_content"
android:text="@string/weight1"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<EditText
android:id="@+id/dailyd_weight"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:inputType="numberDecimal"
android:maxLines="1"
android:padding="@dimen/dp_5"
android:background="@drawable/shape_bg"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />


+ 21
- 21
app/src/main/res/layout/item_productiondailydetail.xml View File

@ -16,15 +16,15 @@
android:layout_height="wrap_content"
android:text="@string/buildinghomes1"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView
android:id="@+id/production_info_buildinghome"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -41,15 +41,15 @@
android:layout_height="wrap_content"
android:text="@string/dayage1"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView
android:id="@+id/production_info_dayage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -66,15 +66,15 @@
android:layout_height="wrap_content"
android:text="@string/survival"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView
android:id="@+id/production_info_survival"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -91,15 +91,15 @@
android:layout_height="wrap_content"
android:text="@string/death1"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView
android:id="@+id/production_info_death"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -116,15 +116,15 @@
android:layout_height="wrap_content"
android:text="@string/eliminate"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView
android:id="@+id/production_info_eliminate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -141,15 +141,15 @@
android:layout_height="wrap_content"
android:text="@string/water"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView
android:id="@+id/production_info_water"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -166,15 +166,15 @@
android:layout_height="wrap_content"
android:text="@string/weight1"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView
android:id="@+id/production_info_weight"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />


+ 12
- 12
app/src/main/res/layout/lv_header.xml View File

@ -23,15 +23,15 @@
android:layout_height="wrap_content"
android:text="@string/batch"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView
android:id="@+id/production_info_batch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -48,15 +48,15 @@
android:layout_height="wrap_content"
android:text="@string/farm1"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView
android:id="@+id/production_info_farm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -73,15 +73,15 @@
android:layout_height="wrap_content"
android:text="@string/Accountingunit"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView
android:id="@+id/production_info_account"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />
@ -98,15 +98,15 @@
android:layout_height="wrap_content"
android:text="@string/date"
android:textColor="@color/grey888888"
android:textSize="@dimen/text_size_18" />
android:textSize="@dimen/text_size_16" />
<TextView
android:id="@+id/production_info_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_10"
android:textColor="@color/black303030"
android:textSize="@dimen/text_size_20" />
android:textSize="@dimen/text_size_18" />
</LinearLayout>
<include layout="@layout/include_line" />


+ 1
- 0
app/src/main/res/values/colors.xml View File

@ -36,5 +36,6 @@
<color name="blue48dac7">#48dac7</color>
<color name="grenn48da59">#48da59</color>
<color name="perpod26ee4">#d26ee4</color>
<color name="greydp">#dbdbdb</color>
</resources>

Loading…
Cancel
Save