diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 1316f3a..f4df6b8 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -14,7 +14,7 @@ diff --git a/GSKMTOrange/src/main/ic_launcher-web.png b/GSKMTOrange/src/main/ic_launcher-web.png new file mode 100644 index 0000000..74ed75d Binary files /dev/null and b/GSKMTOrange/src/main/ic_launcher-web.png differ diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index 9a688af..453d27a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -108,6 +108,8 @@ public class LoginActivity extends AppCompatActivity { int eventType; + Button museridSignInButton; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -159,7 +161,7 @@ public class LoginActivity extends AppCompatActivity { } - Button museridSignInButton = (Button) findViewById(R.id.user_login_button); + museridSignInButton = (Button) findViewById(R.id.user_login_button); museridSignInButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View view) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java index bcd411c..6137631 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java @@ -272,6 +272,7 @@ public class AutoUpdateActivity extends AppCompatActivity { /* Intent i = new Intent(activity, StorelistActivity.class); activity.startActivity(i); activity.finish();*/ + finish(); } }); diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/ic_launcher.png b/GSKMTOrange/src/main/res/mipmap-hdpi/ic_launcher.png index cde69bc..5cb27d4 100644 Binary files a/GSKMTOrange/src/main/res/mipmap-hdpi/ic_launcher.png and b/GSKMTOrange/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-mdpi/ic_launcher.png b/GSKMTOrange/src/main/res/mipmap-mdpi/ic_launcher.png index c133a0c..b2beb5d 100644 Binary files a/GSKMTOrange/src/main/res/mipmap-mdpi/ic_launcher.png and b/GSKMTOrange/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-xhdpi/ic_launcher.png b/GSKMTOrange/src/main/res/mipmap-xhdpi/ic_launcher.png index bfa42f0..f3d5310 100644 Binary files a/GSKMTOrange/src/main/res/mipmap-xhdpi/ic_launcher.png and b/GSKMTOrange/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-xxhdpi/ic_launcher.png b/GSKMTOrange/src/main/res/mipmap-xxhdpi/ic_launcher.png index 324e72c..2de4a5b 100644 Binary files a/GSKMTOrange/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/GSKMTOrange/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/GSKMTOrange/src/main/res/mipmap-xxxhdpi/ic_launcher.png index aee44e1..8aaf75b 100644 Binary files a/GSKMTOrange/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/GSKMTOrange/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 41288ad..20e6089 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -62,7 +62,7 @@ Data Export Exit - Setting + Settings Services T2P Compliance @@ -148,9 +148,9 @@ Photo Additional Visibility - Are you sure You Want To Save + Are you sure you want to save Please Add Data - Are you sure You Want To Add + Are you sure you want to add Do You Want To Delete Data store Do You Want To Delete @@ -173,7 +173,7 @@ Uploading Geotag Images success Are you sure you want to Checkout - No Network Connection. Please check your Internet Connection + No Network Connection. Please Check Your Internet Connection Non Working Reason Close