AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into GG_StockFacing_PlanogramTracker

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-02-03 11:42:06 +05:30
committed by GitHub
parent d4ca1184cf 4e34174194
commit 3c901931ec
10 changed files with 336 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/additionallistlayout.xml
+10 -7
View File
@@ -7,7 +7,7 @@
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="184dp"
android:layout_height="96dp"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp"
@@ -22,6 +22,7 @@
android:layout_marginTop="10dp"
android:layout_weight="10"
android:orientation="horizontal"
android:visibility="gone"
android:weightSum="25">
<TextView
@@ -51,14 +52,14 @@
android:layout_marginBottom="2dp"
android:layout_weight="10"
android:orientation="horizontal"
android:weightSum="25">
android:weightSum="50">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="10"
android:layout_weight="30"
android:text="@string/displayname"
android:textStyle="bold" />
@@ -106,19 +107,21 @@
<!-- </LinearLayout> -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="10"
android:orientation="vertical"
android:weightSum="25">
<Button
android:id="@+id/delete_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_weight="10"
android:layout_marginRight="30dp"
android:layout_weight="7"
android:background="@color/grey_background"
android:text="@string/delete" />
android:text="@string/delete"
android:layout_gravity="right"/>
</LinearLayout>
GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
+44 -17
View File
@@ -22,11 +22,10 @@
</android.support.design.widget.AppBarLayout>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="60"
android:layout_weight="50"
android:background="@color/grey_background"
card_view:cardCornerRadius="20dp"
@@ -77,7 +76,8 @@
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="3">
android:weightSum="3"
android:visibility="gone">
<TextView
android:id="@+id/tv_brand"
@@ -133,12 +133,12 @@
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="3">
android:weightSum="5">
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_weight="1.5"
android:background="@color/grey_background">
<TextView
@@ -165,11 +165,38 @@
android:layout_centerInParent="true"
android:background="@mipmap/camera_orange" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/grey_background">
<ImageView
android:id="@+id/btn_image2"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerInParent="true"
android:background="@mipmap/camera_orange" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@color/grey_background">
<ImageView
android:id="@+id/btn_image3"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerInParent="true"
android:background="@mipmap/camera_orange" />
</RelativeLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight=".5"
android:background="@color/grey_background">
<ImageView
@@ -226,7 +253,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="10dp"
android:layout_weight="40"
android:layout_weight="50"
android:padding="10dp"
card_view:cardBackgroundColor="@color/colorOrange"
card_view:cardCornerRadius="20dp"
@@ -235,17 +262,17 @@
<ListView
android:id="@+id/listviewlv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:cacheColorHint="#00000000"
<ListView
android:id="@+id/listviewlv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:cacheColorHint="#00000000"
android:choiceMode="singleChoice"
android:divider="#ff9933"
android:dividerHeight="2dp"
android:fastScrollEnabled="true"
android:smoothScrollbar="true"></ListView>
android:choiceMode="singleChoice"
android:divider="#ff9933"
android:dividerHeight="2dp"
android:fastScrollEnabled="true"
android:smoothScrollbar="true"></ListView>
</android.support.v7.widget.CardView>
GSKMTOrange/src/main/res/values-tr/string.xml
+1 -1
View File
@@ -235,7 +235,7 @@
<string name="fill_gaps_data">Lütfen GAP verilerini doldurun</string>
<string name="enter_the_values">Değerleri girin</string>
<string name="datanotfound">Içinde bulunmayan veri</string>
</resources>
GSKMTOrange/src/main/res/values/strings.xml
+3
View File
@@ -265,6 +265,9 @@
<string name="first_geotag_the_store">First geotag the store</string>
<string name="new_update_available">New Update Available \n\n Yeni güncelleme var</string>
<string name="title_activity_stock_facing__planogram_tracker">Planogram Tracker</string>
<string name="datanotfound">Data not found in</string>
</resources>