This commit is contained in:
CPM
2020-09-28 18:47:09 +05:30
parent c6ca448df0
commit d3a836cd20
15 changed files with 2372 additions and 20 deletions
Binary file not shown.
+15 -13
View File
@@ -21,27 +21,27 @@ android {
targetSdkVersion 26
//For Egypt
/* versionCode 29
versionName "4.1"*/
versionCode 29
versionName "4.1"
//For UAE
/* versionCode 24
versionName "3.6"*/
//For Turkey
/* versionCode 25
versionName "3.7"*/
//For Turkey
/* versionCode 25
versionName "3.7"*/
//For KSA
versionCode 27
versionName "3.9"
/* versionCode 27
versionName "3.9"*/
//For SA
/*versionCode 26
versionName "3.7"*/
/* versionCode 22
versionName "3.4"*/
/* versionCode 27
versionName "3.8"*/
// versionCode 22
// versionName "3.4"
multiDexEnabled true
@@ -62,6 +62,8 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation files('libs/ksoap2-android-assembly-3.6.2-jar-with-dependencies.jar')
implementation 'com.android.support:support-v4:28.0.0'
implementation 'android.arch.navigation:navigation-fragment:1.0.0'
implementation 'android.arch.navigation:navigation-ui:1.0.0'
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
+6 -2
View File
@@ -24,11 +24,15 @@
android:largeHeap="true"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".dailyentry.NewStockDataActivity"
android:label="@string/title_activity_new_stock_data"
android:theme="@style/AppTheme.NoActionBar"></activity>
<activity
android:name=".dailyentry.CounterfeitIndicatorWebActivity"
android:label="@string/title_activity_counterfeit_indicator_web"
android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".dailyentry.StockPricingActivity"
android:label="@string/title_activity_stock_pricing"
@@ -8779,4 +8779,223 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
//usk
public void InsertMSL_Availability_StockFacingWelance(
String storeId, String categoryId, List<MSL_AvailabilityStockFacingGetterSetter> hashMapListHeaderData,
HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> hashMapListChildData) {
ContentValues values = new ContentValues();
try {
db.beginTransaction();
for (int i = 0; i < hashMapListHeaderData.size(); i++) {
for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) {
MSL_AvailabilityStockFacingGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
values.put("Store_Id", storeId);
values.put("Category_Id", categoryId);
values.put("Brand_Id", hashMapListHeaderData.get(i).getBrand_id());
values.put("SKU_ID", data.getSku_id());
values.put("SKU", data.getSku());
values.put("SKU_SEQUENCE", data.getSku_sequence());
values.put("MBQ", data.getMbq());
values.put("TOGGLE_VALUE", data.getToggleValue());
if (data.getFacing().equals("")) {
values.put("FACING", "0");
} else {
values.put("FACING", data.getFacing());
}
values.put("STOCK", data.getStock());
values.put("COMPANY_ID", data.getCompany_id());
values.put("MUST_HAVE", data.getMust_have());
db.insert(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, null, values);
}
}
db.setTransactionSuccessful();
db.endTransaction();
} catch (Exception ex) {
Log.d("Exception ", " in Insert MSL_Availability_StockFacing " + ex.toString());
}
}
public void updateMSL_Availability_StockFacingWelance(
String storeId, String categoryId, List<MSL_AvailabilityStockFacingGetterSetter> hashMapListHeaderData,
HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> hashMapListChildData) {
ContentValues values = new ContentValues();
try {
db.beginTransaction();
for (int i = 0; i < hashMapListHeaderData.size(); i++) {
for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) {
MSL_AvailabilityStockFacingGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j);
values.put("TOGGLE_VALUE", data.getToggleValue());
values.put("STOCK", data.getStock());
if (data.getFacing().equals("")) {
values.put("FACING", "0");
} else {
values.put("FACING", data.getFacing());
}
db.update(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, values,
"Brand_Id ='" + hashMapListHeaderData.get(i).getBrand_id() + "' AND SKU_ID ='" + data.getSku_id() +
"' AND Category_Id='" + categoryId + "' AND Store_Id='" + storeId + "'", null);
}
}
db.setTransactionSuccessful();
db.endTransaction();
} catch (Exception ex) {
Log.d("Exception ", " in Insert MSL_Availability_StockFacing " + ex.toString());
}
}
@SuppressLint("LongLogTag")
public boolean checkMsl_Availability_StockFacingDataWelance(String store_id, String category_id) {
Log.d("MSL_Availability ", "Stock data--------------->Start<------------");
ArrayList<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Msl_Availability_Stock_Facing_Data " +
"where category_id='" + category_id + "' and Store_Id='" + store_id + "'", null);
if (dbcursor != null) {
if (dbcursor.moveToFirst()) {
do {
MSL_AvailabilityStockFacingGetterSetter sb = new MSL_AvailabilityStockFacingGetterSetter();
sb.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
list.add(sb);
} while (dbcursor.moveToNext());
}
dbcursor.close();
return list.size() > 0;
}
} catch (Exception e) {
Log.d("Exception ", "when fetching Records!!!!!!!!!!!!!!!!!!!!!" + e.toString());
return false;
}
Log.d("MSL_Availability_StockFacing ", "midday---------------------->Stop<-----------");
return false;
}
public ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> getPlanogramAddShelfHeaderAfterSaveDataWelance(
String store_id, String category_id) {
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Stock_Facing_Planogram_Header_Data " +
"where Store_id='" + store_id + "' and category_id='" + category_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter();
cd.setKey_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("KEY_ID")));
cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("category_id")));
cd.setSp_addShelf_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_id")));
cd.setSp_addShelf(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf")));
cd.setSp_shelfPosition(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_Position")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get Planogram Shelf Header After Save !" + e.toString());
}
return list;
}
public ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> getStockAndFacingPlanogramAfterSKUDataWelance(
String key_id) {
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Stock_Facing_Planogram_Child_Data " +
"where common_id='" + key_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter();
cd.setSp_addShelf_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_id")));
cd.setSp_addShelf(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf")));
cd.setSp_shelfPosition(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_Position")));
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("sku_id")));
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("sku")));
cd.setCheckbox_sku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("checkbox_sku")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
return list;
}
return list;
}
public ArrayList<MSL_AvailabilityStockFacingGetterSetter> getMSL_Availability_StockFacingSKU_AfterSaveDataWelance(
String category_id, String brand_id, String store_id) {
ArrayList<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("Select * from Msl_Availability_Stock_Facing_Data " +
"where category_id='" + category_id + "' and Brand_Id='" + brand_id + "' AND Store_Id='" + store_id + "'", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
cd.setToggleValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("TOGGLE_VALUE")));
cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("FACING")));
cd.setStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOCK")));
cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
cd.setMust_have(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MUST_HAVE")));
list.add(cd);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception ", "get MSL_Availability Sku After Save Data!" + e.toString());
return list;
}
return list;
}
}
@@ -193,7 +193,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
//populateAutoComplete();
mPasswordView = (EditText) findViewById(R.id.password);
/* museridView.setText("egypt.1");
/* museridView.setText("test.egypt");
mPasswordView.setText("cpm123");*/
/* museridView.setText("egypt.1");
mPasswordView.setText("cpm123");*/
/* museridView.setText("DSR_Alex_61");
mPasswordView.setText("cpm123");*/
@@ -205,19 +207,22 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
mPasswordView.setText("cpm123");*/
//UAE
/*museridView.setText("nazeer.k");
mPasswordView.setText("cpm@123");*/
/* museridView.setText("testuae");
mPasswordView.setText("cpm123");*/
//KSA
/* museridView.setText("mohamed.o");
mPasswordView.setText("cpm@123");*/
/* museridView.setText("testksa");
/* museridView.setText("testksa");123
mPasswordView.setText("cpm123");*/
//turkey
/* museridView.setText("testmer");
mPasswordView.setText("cpm123");*/
/* museridView.setText("testksa");
mPasswordView.setText("cpm123");*/
mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) {
@@ -0,0 +1,37 @@
package cpm.com.gskmtorange.dailyentry;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import androidx.navigation.fragment.NavHostFragment;
import cpm.com.gskmtorange.R;
public class FirstFragment extends Fragment {
@Override
public View onCreateView(
LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState
) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_first, container, false);
}
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
view.findViewById(R.id.button_first).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
NavHostFragment.findNavController(FirstFragment.this)
.navigate(R.id.action_FirstFragment_to_SecondFragment);
}
});
}
}
@@ -0,0 +1,37 @@
package cpm.com.gskmtorange.dailyentry;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import androidx.navigation.fragment.NavHostFragment;
import cpm.com.gskmtorange.R;
public class SecondFragment extends Fragment {
@Override
public View onCreateView(
LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState
) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_second, container, false);
}
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
view.findViewById(R.id.button_second).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
NavHostFragment.findNavController(SecondFragment.this)
.navigate(R.id.action_SecondFragment_to_FirstFragment);
}
});
}
}
@@ -613,6 +613,59 @@ public class UploadActivity extends AppCompatActivity {
data.value = 15;
data.name = getString(R.string.availability_data_uploading);
publishProgress(data);
//usk additional store
//Coaching visit data
db.open();
coachingVisitData = db.getCoachingVisitData(coverageList.get(i).getStoreId());
if (coachingVisitData.size() > 0) {
String onXml_coaching_data = "", coaching_xml = "";
for (int j = 0; j < coachingVisitData.size(); j++) {
String exist;
if (coachingVisitData.get(j).isExists()) {
exist = "1";
} else {
exist = "0";
}
coaching_xml = "[COACHING_VISIT_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[EMP_ID]" + coachingVisitData.get(j).getEmp_id() + "[/EMP_ID]"
+ "[IMAGE]" + coachingVisitData.get(j).getImg_path() + "[/IMAGE]"
+ "[IS_EXIST]" + exist + "[/IS_EXIST]"
+ "[/COACHING_VISIT_DATA]";
onXml_coaching_data = onXml_coaching_data + coaching_xml;
}
final String sos_xml = "[DATA]" + onXml_coaching_data + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "COACHING_VISIT_DATA");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
data.value = 64;
data.name = getString(R.string.coaching_visit);
publishProgress(data);
}
//end usk
} else if (coverageList.get(i).getFlag_from().equals(CommonString.FROM_PHARMA)) {
//Pharmacy store data
@@ -2185,6 +2238,7 @@ public class UploadActivity extends AppCompatActivity {
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".dailyentry.NewStockDataActivity">
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_new_stock_data" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@mipmap/save_icon" />
</android.support.design.widget.CoordinatorLayout>
@@ -0,0 +1,220 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/content_msl__availability"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_new_stock_data">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<TextView
android:id="@+id/txt_mslAvailabilityName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFF1710F"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingTop="10dp"
android:text="Must Have Availability"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black"
android:visibility="gone" />
<!--Camera Layout-->
<LinearLayout
android:id="@+id/lin_camera"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="4">
<!--camera 1-->
<LinearLayout
android:id="@+id/lin_camera1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera1"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
<!--android:src="@mipmap/camera_orange"-->
</LinearLayout>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />
<!--camera 2-->
<LinearLayout
android:id="@+id/lin_camera2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera2"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
<View
android:id="@+id/view_camera2"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />
<!--camera 3-->
<LinearLayout
android:id="@+id/lin_camera3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera3"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
<View
android:id="@+id/view_camera3"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/grey_dark_background" />
<!--camera 4-->
<LinearLayout
android:id="@+id/lin_camera4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/layout_click_background_effect"
android:gravity="center_horizontal"
android:padding="5dp">
<ImageView
android:id="@+id/img_camera4"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginRight="10dp" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/grey_dark_background" />
<LinearLayout
android:id="@+id/lin_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp"
android:weightSum="1">
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".25"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/msl_availability_mbq"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".25"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/msl_availability_availability"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".25"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/stock_facing_faceup"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".25"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/stock_facing_stock"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>
</LinearLayout>
<ExpandableListView
android:id="@+id/expandableListView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:cacheColorHint="#00000000"
android:divider="@null"
android:dividerHeight="0dp"
android:scrollingCache="false" />
</LinearLayout>
</RelativeLayout>
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".FirstFragment">
<TextView
android:id="@+id/textview_first"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/hello_first_fragment"
app:layout_constraintBottom_toTopOf="@id/button_first"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_first"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/next"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/textview_first" />
</android.support.constraint.ConstraintLayout>
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SecondFragment">
<TextView
android:id="@+id/textview_second"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@id/button_second"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_second"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/previous"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/textview_second" />
</android.support.constraint.ConstraintLayout>
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nav_graph"
app:startDestination="@id/FirstFragment">
<fragment
android:id="@+id/FirstFragment"
android:name="cpm.com.gskmtorange.dailyentry.FirstFragment"
android:label="@string/first_fragment_label"
tools:layout="@layout/fragment_first">
<action
android:id="@+id/action_FirstFragment_to_SecondFragment"
app:destination="@id/SecondFragment" />
</fragment>
<fragment
android:id="@+id/SecondFragment"
android:name="cpm.com.gskmtorange.dailyentry.SecondFragment"
android:label="@string/second_fragment_label"
tools:layout="@layout/fragment_second">
<action
android:id="@+id/action_SecondFragment_to_FirstFragment"
app:destination="@id/FirstFragment" />
</fragment>
</navigation>
+10 -1
View File
@@ -414,11 +414,20 @@
<string name="title_activity_counterfeit_indicator_web">Counterfeit Indicators</string>
<string name="additional_adhoc_stores">Additional Stores - Adhoc</string>
<!-- usk competition promotion-->
<!-- usk competition promotion-->
<string name="promotion_type">Promo Type</string>
<string name="competitor">Competitor Name</string>
<string name="comment">Comment</string>
<string name="competition_promotion">Competition Promotion</string>
<string name="title_activity_new_stock_data">NewStockDataActivity</string>
<!-- Strings used for fragments for navigation -->
<string name="first_fragment_label">First Fragment</string>
<string name="second_fragment_label">Second Fragment</string>
<string name="next">Next</string>
<string name="previous">Previous</string>
<string name="hello_first_fragment">Hello first fragment</string>
<string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
</resources>