diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index cee619d..258a19f 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index f6de050..9a38d6c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -16,6 +16,7 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 18a48ad..a6efb79 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -46,7 +46,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 4467985..991a5dc 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,12 +2,9 @@ - - - - - - + + + \ No newline at end of file diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 10fc8c5..393beda 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -27,9 +27,9 @@ android { versionCode 31 versionName "4.3"*/ - /* //For UAE - versionCode 26 - versionName "3.8"*/ + //For UAE + versionCode 25 + versionName "3.7" //For Turkey @@ -39,8 +39,8 @@ android { //For KSA /* versionCode 28 versionName "4.0"*/ - versionCode 27 - versionName "3.8" + /* versionCode 27 + versionName "3.8"*/ //For SA /* versionCode 28 @@ -51,7 +51,7 @@ android { versionName "3.4"*/ //Kenya - /* versionCode 2 + /* versionCode 2 versionName "1.1"*/ multiDexEnabled true diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index 37dcbe0..c20f429 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -95,7 +95,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean; */ public class GSKOrangeDB extends SQLiteOpenHelper { - public static final String DATABASE_NAME = "GSK_ORANGE_DB66"; + public static final String DATABASE_NAME = "GSK_ORANGE_DB67"; public static final int DATABASE_VERSION = 15; TableBean tableBean; private SQLiteDatabase db; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index eaf502a..cee4dad 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -144,7 +144,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. Button museridSignInButton; - // Trace myTrace; + // Trace myTrace; GoogleApiClient mGoogleApiClient; private static int UPDATE_INTERVAL = 200; // 5 sec @@ -163,9 +163,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. setContentView(R.layout.activity_login); context = this; // Obtain the FirebaseAnalytics instance. - // mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); + // mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); - // Fabric.with(this, new Crashlytics()); + // Fabric.with(this, new Crashlytics()); TextView tv_version = (TextView) findViewById(R.id.tv_version_code); @@ -201,29 +201,31 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. /* museridView.setText("mini_ka_84_1"); mPasswordView.setText("cpm123");*/ - //UAE - /* museridView.setText("testuae"); - mPasswordView.setText("cpm123");*/ + //UAE + museridView.setText("testuae"); + mPasswordView.setText("cpm123"); //KSA - museridView.setText("Esmail.d"); - mPasswordView.setText("cpm@123"); + /* museridView.setText("Esmail.d"); + mPasswordView.setText("cpm@123");*/ /* museridView.setText("testksa"); mPasswordView.setText("cpm123");*/ + /* museridView.setText("Ahmed.saied"); + mPasswordView.setText("cpm@123");*/ - //turkey + //turkey /* museridView.setText("testmer"); mPasswordView.setText("cpm123"); */ - //sa + //sa /* museridView.setText("testsa"); mPasswordView.setText("cpm123"); */ //Kenya - // museridView.setText("test.Kenya"); - /* museridView.setText("testkenya"); + // museridView.setText("test.Kenya"); + /* museridView.setText("testkenya"); mPasswordView.setText("cpm123");*/ mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() { @Override @@ -640,9 +642,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. bundle.putString(FirebaseAnalytics.Param.ITEM_NAME, CommonString.KEY_LOGIN_DATA); bundle.putString(FirebaseAnalytics.Param.CONTENT_TYPE, "Data"); bundle.putString(CommonString.KEY_LANGUAGE, preferences.getString(CommonString.KEY_LANGUAGE, "")); - // mFirebaseAnalytics.logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, bundle); + // mFirebaseAnalytics.logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, bundle); - // Crashlytics.setUserIdentifier(userid); + // Crashlytics.setUserIdentifier(userid); return CommonString.KEY_SUCCESS; @@ -689,9 +691,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. /* final AlertMessage message = new AlertMessage( LoginActivity.this, AlertMessage.MESSAGE_EXCEPTION, "acra_login", e);*/ - // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); - // Crashlytics.logException(e.getCause()); - // Crashlytics.logException(new Exception("My custom login Exception")); + // Crashlytics.log(7, CommonString.MESSAGE_EXCEPTION, e.toString()); + // Crashlytics.logException(e.getCause()); + // Crashlytics.logException(new Exception("My custom login Exception")); runOnUiThread(new Runnable() { @Override @@ -710,7 +712,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. super.onPostExecute(result); //Stop performance trace - /// myTrace.stop(); + /// myTrace.stop(); if (result.equals(CommonString.KEY_SUCCESS)) { @@ -718,7 +720,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. boolean forSA = false; // database.open(); - if(forSA){ + if (forSA) { //For SA Only if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) { @@ -742,8 +744,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. //uploadPreviousImages(); } - } - else { + } else { //for other than SA if (preferences.getString(CommonString.KEY_VERSION, "").equals( Integer.toString(versionCode))) { @@ -1257,13 +1258,14 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. LoginGetterSetter login_data; - private void setLanguageDataFromSharedPreferences(){ + private void setLanguageDataFromSharedPreferences() { Gson gson = new Gson(); login_data = new LoginGetterSetter(); String jsonPreferences = preferences.getString(CommonString.KEY_LOOGIN_PREF, ""); - Type type = new TypeToken() {}.getType(); + Type type = new TypeToken() { + }.getType(); login_data = gson.fromJson(jsonPreferences, type); language = login_data.getCULTURE_NAME(); @@ -1272,9 +1274,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. String lang = preferences.getString(CommonString.KEY_LANGUAGE, ""); - if(language.size()>0){ - for(int i=0; i 0) { + for (int i = 0; i < language.size(); i++) { + if (lang.equals(language.get(i))) { editor.putString(CommonString.KEY_LANGUAGE, language.get(i)); editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(i)); editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, notice_url.get(i)); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index da69587..1ea7aa0 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -306,6 +306,10 @@ public class CategoryListActivity extends AppCompatActivity { categoryList.get(i).setCategory_img(R.mipmap.analgesics_tick); }else if (category_id.equals("8")) { categoryList.get(i).setCategory_img(R.mipmap.first_aid_tick); + }else if (category_id.equals("9")) { + categoryList.get(i).setCategory_img(R.mipmap.pain_relief_tick); + } else if (category_id.equals("10")) { + categoryList.get(i).setCategory_img(R.mipmap.respiratory_health_tick); } } else { if (category_id.equals("1")) { @@ -324,6 +328,10 @@ public class CategoryListActivity extends AppCompatActivity { categoryList.get(i).setCategory_img(R.mipmap.analgesics); }else if (category_id.equals("8")) { categoryList.get(i).setCategory_img(R.mipmap.first_aid); + }else if (category_id.equals("9")) { + categoryList.get(i).setCategory_img(R.mipmap.pain_relief); + } else if (category_id.equals("10")) { + categoryList.get(i).setCategory_img(R.mipmap.respiratory_health); } } } diff --git a/GSKMTOrange/src/main/res/layout/category_menu_row.xml b/GSKMTOrange/src/main/res/layout/category_menu_row.xml index bbaada0..5ab6d72 100644 --- a/GSKMTOrange/src/main/res/layout/category_menu_row.xml +++ b/GSKMTOrange/src/main/res/layout/category_menu_row.xml @@ -30,8 +30,7 @@ + android:orientation="vertical"> diff --git a/GSKMTOrange/src/main/res/layout/content_store_wise_performance.xml b/GSKMTOrange/src/main/res/layout/content_store_wise_performance.xml index b42a329..3088b15 100644 --- a/GSKMTOrange/src/main/res/layout/content_store_wise_performance.xml +++ b/GSKMTOrange/src/main/res/layout/content_store_wise_performance.xml @@ -94,7 +94,7 @@ android:layout_weight="4" android:gravity="center" android:padding="5dp" - android:text="@string/category_performance_t2p" + android:text="@string/title_posm" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="#000" /> diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/pain_relief.png b/GSKMTOrange/src/main/res/mipmap-hdpi/pain_relief.png new file mode 100644 index 0000000..3978861 Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/pain_relief.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/pain_relief_tick.png b/GSKMTOrange/src/main/res/mipmap-hdpi/pain_relief_tick.png new file mode 100644 index 0000000..3cdd881 Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/pain_relief_tick.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/respiratory_health.png b/GSKMTOrange/src/main/res/mipmap-hdpi/respiratory_health.png new file mode 100644 index 0000000..3978861 Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/respiratory_health.png differ diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/respiratory_health_tick.png b/GSKMTOrange/src/main/res/mipmap-hdpi/respiratory_health_tick.png new file mode 100644 index 0000000..3cdd881 Binary files /dev/null and b/GSKMTOrange/src/main/res/mipmap-hdpi/respiratory_health_tick.png differ