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

newcode

Browse Source
This commit is contained in:
ashishandroid
2017-01-18 15:40:45 +05:30
parent 9ff366cbeb
commit f4a8b065ea
7 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/AndroidManifest.xml
+2 -2
View File
@@ -49,12 +49,12 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".GeoTag.GeoTagStoreList" android:name=".GeoTag.GeoTagStoreList"
android:label="@string/title_activity_store_list_geotag" android:label="@string/title_activity_store_list"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" /> android:theme="@style/AppTheme.NoActionBar" />
<activity <activity
android:name=".dailyentry.StoreListActivity" android:name=".dailyentry.StoreListActivity"
android:label="@string/title_activity_store_list_geotag" android:label="@string/title_activity_store_list"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" /> android:theme="@style/AppTheme.NoActionBar" />
<activity <activity
GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
+10 -2
View File
@@ -719,13 +719,13 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
new GeoTagImageUpload(GeoTagActivity.this).execute(); new GeoTagImageUpload(GeoTagActivity.this).execute();
/* Intent intent = new Intent( Intent intent = new Intent(
GeoTagActivity.this, GeoTagActivity.this,
GeoTagStoreList.class); GeoTagStoreList.class);
startActivity(intent); startActivity(intent);
GeoTagActivity.this.finish();*/ GeoTagActivity.this.finish();
} }
else if(!result.equals(CommonString.KEY_SUCCESS)) else if(!result.equals(CommonString.KEY_SUCCESS))
@@ -888,6 +888,14 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
+ result, getResources().getString(R.string.success), null); + result, getResources().getString(R.string.success), null);
message.showMessage(); message.showMessage();
Intent intent = new Intent(
GeoTagActivity.this,
GeoTagStoreList.class);
startActivity(intent);
GeoTagActivity.this.finish();
} }
else if(!result.equals(CommonString.KEY_SUCCESS)) else if(!result.equals(CommonString.KEY_SUCCESS))
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java
+1 -1
View File
@@ -435,7 +435,7 @@ public class NonWorkingReason extends AppCompatActivity implements
alert.show(); alert.show();
} else { } else {
Toast.makeText(getApplicationContext(), R.string.title_activity_select_dropdown, Toast.makeText(getApplicationContext(), R.string.pleaseenterRemarks,
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} }
} else { } else {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/messgae/AlertMessage.java
-1
View File
@@ -58,7 +58,6 @@ public class AlertMessage {
} }
} }
public void ShowAlert1(String str) { public void ShowAlert1(String str) {
GSKMTOrange/src/main/res/layout/nonworking.xml
+2 -2
View File
@@ -92,7 +92,7 @@
android:layout_above="@+id/reasontxt" android:layout_above="@+id/reasontxt"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:text="Remark" android:text="@string/Remark"
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
@@ -120,7 +120,7 @@
android:layout_height="40sp" android:layout_height="40sp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:text="SAVE" android:text="@string/save"
android:textColor="#ffffff" android:textColor="#ffffff"
android:textSize="17sp" /> android:textSize="17sp" />
</RelativeLayout> </RelativeLayout>
GSKMTOrange/src/main/res/values-tr/string.xml
+9 -3
View File
@@ -161,10 +161,16 @@
<string name="uploadeddata">Veriler Paylaşılıyor ,</string> <string name="uploadeddata">Veriler Paylaşılıyor ,</string>
<string name="DataNot">Veriler Paylaşılmadı ,</string> <string name="DataNot">Veriler Paylaşılmadı ,</string>
<string name="delete">Sil</string> <string name="delete">Sil</string>
<string name="adddatatoclick">Click Yes To Add Data</string> <string name="adddatatoclick">Veri Eklemek İçin Evet tıklayın</string>
<string name="displayname">Teşhir Türü</string> <string name="displayname">Teşhir Türü</string>
<string name="storefront">Click Store Front Image</string>
<string name="brandname">Brand Name</string>
<string name="skuname">SKU Name</string>
<string name="quantity">Teşhir Sayısı</string>
<string name="title_activity_store_geotag">Coğrafi Konum</string>
<string name="title_activity_store_list">Store List</string>
<string name="Remark">Remark</string>
<string name="pleaseenterRemarks">Please fill Remark</string>
</resources> </resources>
GSKMTOrange/src/main/res/values/strings.xml
+3 -1
View File
@@ -50,7 +50,7 @@
<string name="select_language">Please select language</string> <string name="select_language">Please select language</string>
<string name="title_activity_select_language">Select Language</string> <string name="title_activity_select_language">Select Language</string>
<string name="title_activity_store_list_geotag">Store List</string> <string name="title_activity_store_list">Store List</string>
<string name="title_activity_store_geotag">Geo Tag</string> <string name="title_activity_store_geotag">Geo Tag</string>
@@ -218,6 +218,8 @@
<string name="DataNot"> Data Not Uploaded ,</string> <string name="DataNot"> Data Not Uploaded ,</string>
<string name="displayname">Display Name</string> <string name="displayname">Display Name</string>
<string name="adddatatoclick">Click Yes To Add Data</string> <string name="adddatatoclick">Click Yes To Add Data</string>
<string name="Remark">Remark</string>
<string name="pleaseenterRemarks">Please fill Remark</string>
</resources> </resources>