diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 218e140..3683016 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 6229e93..18a48ad 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -12,7 +12,7 @@ - + diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 874fc35..982dc07 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -1,9 +1,10 @@ apply plugin: 'com.android.application' //apply plugin: 'io.fabric' - +apply plugin: 'com.google.gms.google-services' +apply plugin: 'com.google.firebase.crashlytics' android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + compileSdkVersion 29 + buildToolsVersion '29.0.3' useLibrary 'org.apache.http.legacy' @@ -13,12 +14,14 @@ android { configurations { all*.exclude module: 'okio' + all*.exclude group: 'com.squareup.okhttp3', module: 'okhttp' + all*.exclude module: 'support-v4' // This removes all other versions of `support-v4` if gets duplicated from all the artifacts. } defaultConfig { applicationId "cpm.com.gskmtorange" - minSdkVersion 17 - targetSdkVersion 26 + minSdkVersion 20 + targetSdkVersion 29 /*//For Egypt versionCode 31 @@ -58,43 +61,43 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + firebaseCrashlytics { + nativeSymbolUploadEnabled true + } } dependencies { - - //implementation 'com.google.firebase:firebase-crash:11.8.0' - implementation 'com.google.firebase:firebase-messaging:17.3.3' 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 'androidx.cardview:cardview:1.0.0' + implementation 'com.google.android.material:material:1.2.1' + implementation project(path: ':library') + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + testImplementation 'junit:junit:4.13.1' 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' - }) - - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' - - implementation 'com.android.support:cardview-v7:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' - - implementation 'com.google.code.gson:gson:2.7' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation 'com.google.code.gson:gson:2.8.6' + implementation 'com.github.bumptech.glide:glide:4.11.0' + implementation platform('com.google.firebase:firebase-bom:25.12.0') + implementation 'com.google.firebase:firebase-analytics' + implementation 'com.google.firebase:firebase-crashlytics-ndk' + implementation 'com.google.firebase:firebase-messaging' + implementation 'com.google.android.gms:play-services-location:17.1.0' + implementation 'com.google.android.gms:play-services-maps:17.0.0' + implementation 'com.kyanogen.signatureview:signature-view:1.0' + implementation 'com.android.support:multidex:1.0.3' + implementation files('libs/ksoap2-android-assembly-3.6.2-jar-with-dependencies.jar') + implementation 'com.squareup.retrofit2:retrofit:2.0.2' implementation 'com.squareup.retrofit:converter-gson:2.0.0-beta1' - implementation 'com.google.android.gms:play-services-location:16.0.0' - implementation 'com.google.android.gms:play-services-maps:16.0.0' - implementation 'com.google.firebase:firebase-appindexing:17.1.0' - implementation 'com.google.firebase:firebase-perf:16.2.3' - - // Add dependency - // implementation 'com.crashlytics.sdk.android:crashlytics:2.9.7' - implementation 'com.google.firebase:firebase-core:16.0.6' - - testImplementation 'junit:junit:4.12' - implementation project(':library') + implementation 'com.squareup.retrofit2:converter-gson:2.0.2' + implementation 'com.google.firebase:firebase-appindexing:19.1.0' } - - apply plugin: 'com.google.gms.google-services' + + diff --git a/GSKMTOrange/google-services.json b/GSKMTOrange/google-services.json index f0e0ead..e9ed9af 100644 --- a/GSKMTOrange/google-services.json +++ b/GSKMTOrange/google-services.json @@ -1,412 +1,36 @@ { "project_info": { - "project_number": "629309347341", - "firebase_url": "https://silicon-airlock-129611.firebaseio.com", - "project_id": "silicon-airlock-129611", - "storage_bucket": "silicon-airlock-129611.appspot.com" + "project_number": "28956372652", + "project_id": "orangenew-48962", + "storage_bucket": "orangenew-48962.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:629309347341:android:52eff943897b15fd", - "android_client_info": { - "package_name": "com.cpm.LorealGt" - } - }, - "oauth_client": [ - { - "client_id": "629309347341-uljbor88e9g2lju39i72lrmmu5c3f7s0.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.cpm.LorealGt", - "certificate_hash": "95d49e939c2b2ac2229560df2ec290bccc0e9819" - } - }, - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "ads_service": { - "status": 2 - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:629309347341:android:faf02f88429f03e0", - "android_client_info": { - "package_name": "com.cpm.abbott" - } - }, - "oauth_client": [ - { - "client_id": "629309347341-hvjk4q7195vt8nh4uhhpsdt0acbkl2sf.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.cpm.abbott", - "certificate_hash": "65b3e7895b38f52816092df3f55ba516ae1cf016" - } - }, - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "ads_service": { - "status": 2 - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:629309347341:android:668747f586c42392", - "android_client_info": { - "package_name": "com.cpm.gt_gsk1" - } - }, - "oauth_client": [ - { - "client_id": "629309347341-fml2r5aqpn0b6qbgavp7oksfgr3arejd.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.cpm.gt_gsk1", - "certificate_hash": "95d49e939c2b2ac2229560df2ec290bccc0e9819" - } - }, - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "ads_service": { - "status": 2 - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:629309347341:android:12d80bf4582fe855", - "android_client_info": { - "package_name": "com.cpm.lorealpromoter" - } - }, - "oauth_client": [ - { - "client_id": "629309347341-c9rhlpsqdg06su38oid993itbs5utma1.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.cpm.lorealpromoter", - "certificate_hash": "b18b4acbf3fdcd122e94365fe82d8211efc2f82a" - } - }, - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "ads_service": { - "status": 2 - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:629309347341:android:c150baa45302cd82", - "android_client_info": { - "package_name": "com.cpm.pgattendance" - } - }, - "oauth_client": [ - { - "client_id": "629309347341-9roncgt1vf683lneim5ulf42l8iu82ku.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.cpm.pgattendance", - "certificate_hash": "95d49e939c2b2ac2229560df2ec290bccc0e9819" - } - }, - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "ads_service": { - "status": 2 - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:629309347341:android:2c19a23e62057200", - "android_client_info": { - "package_name": "com.cpm.phillips" - } - }, - "oauth_client": [ - { - "client_id": "629309347341-69urr0gm27goh7k5fmsts52t0qd9tt1p.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.cpm.phillips", - "certificate_hash": "8ab20329082aa45376fcf5903996a69416a8e122" - } - }, - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "ads_service": { - "status": 2 - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:629309347341:android:a93714e4fd084096", - "android_client_info": { - "package_name": "com.yadu.myfirestore" - } - }, - "oauth_client": [ - { - "client_id": "629309347341-hcrk3tspevuiie8bnnigejbm5m0ccfi9.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.yadu.myfirestore", - "certificate_hash": "124b531f404f1deb57c5e5d45e19a8b89a0fb4be" - } - }, - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "ads_service": { - "status": 2 - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:629309347341:android:fc7344f5ebbccd0d", + "mobilesdk_app_id": "1:28956372652:android:a70b27bfa2543c229f7909", "android_client_info": { "package_name": "cpm.com.gskmtorange" } }, "oauth_client": [ { - "client_id": "629309347341-9vle41ingne4d8itn8cf8ge4gqg3nth4.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "cpm.com.gskmtorange", - "certificate_hash": "f4469c047dfd3b33b1a34b8c38bd770cd43698e5" - } - }, - { - "client_id": "629309347341-8uvuq4m1r17e40j69djksdjlpnj75ofk.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "cpm.com.gskmtorange", - "certificate_hash": "124b531f404f1deb57c5e5d45e19a8b89a0fb4be" - } - }, - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_id": "28956372652-fgiv0dvng874u5g11u1sv498ok02qsmf.apps.googleusercontent.com", "client_type": 3 } ], "api_key": [ { - "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" + "current_key": "AIzaSyCcvobTX6bSIU9eSaQPuyYqFS5Q4Y-FDX4" } ], "services": { - "analytics_service": { - "status": 1 - }, "appinvite_service": { - "status": 2, "other_platform_oauth_client": [ { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", + "client_id": "28956372652-fgiv0dvng874u5g11u1sv498ok02qsmf.apps.googleusercontent.com", "client_type": 3 } ] - }, - "ads_service": { - "status": 2 - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:629309347341:android:a71c1fa09957cdab", - "android_client_info": { - "package_name": "cpm.com.intelre" - } - }, - "oauth_client": [ - { - "client_id": "629309347341-8irkpjkupn1iqa14o00fa8io09bnrni1.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "cpm.com.intelre", - "certificate_hash": "2c33c124346971cca5ed7da54ee42779822d5bfe" - } - }, - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyBeJUz9RFpsAVDKBrgjICrUVgRb_hpa8xc" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 2, - "other_platform_oauth_client": [ - { - "client_id": "629309347341-j8l60e4hivqtaddronejlrq2njb5nk9f.apps.googleusercontent.com", - "client_type": 3 - } - ] - }, - "ads_service": { - "status": 2 } } } diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 52edb58..eba9331 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -2,6 +2,17 @@ + + + + + + + + + + + @@ -23,6 +34,8 @@ android:label="@string/app_name" android:largeHeap="true" android:supportsRtl="true" + android:requestLegacyExternalStorage="true" + android:usesCleartextTraffic="true" android:theme="@style/AppTheme"> diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java index a424308..e9cef20 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java @@ -10,10 +10,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import android.content.res.ColorStateList; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.graphics.Color; import android.location.Geocoder; import android.location.Location; import android.location.LocationManager; @@ -21,17 +19,9 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.os.Environment; import android.preference.PreferenceManager; import android.provider.MediaStore; import android.provider.Settings; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.View; import android.widget.ProgressBar; @@ -39,7 +29,15 @@ import android.widget.TextView; import android.widget.Toast; //import com.crashlytics.android.Crashlytics; -import com.google.android.gms.appindexing.Action; +/*import com.google.android.gms.appindexing.Action; +import com.google.android.gms.appindexing.AppIndex; +import com.google.android.gms.appindexing.Thing;*/ +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.core.content.FileProvider; + import com.google.android.gms.appindexing.AppIndex; import com.google.android.gms.appindexing.Thing; import com.google.android.gms.common.ConnectionResult; @@ -54,6 +52,9 @@ import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.MarkerOptions; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; +import com.google.firebase.appindexing.Action; import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; @@ -164,8 +165,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb //storeid = getIntent().getStringExtra("Storeid"); str = CommonString.FILE_PATH; - mapFragment = (SupportMapFragment) getSupportFragmentManager() - .findFragmentById(R.id.map); + mapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map); mapFragment.getMapAsync(this); @@ -420,7 +420,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb } // ATTENTION: This was auto-generated to implement the App Indexing API. // See https://g.co/AppIndexing/AndroidStudio for more information. - AppIndex.AppIndexApi.start(client, getIndexApiAction()); + // AppIndex.AppIndexApi.start(client, getIndexApiAction()); } @Override @@ -442,7 +442,9 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb super.onStop();// ATTENTION: This was auto-generated to implement the App Indexing API. // See https://g.co/AppIndexing/AndroidStudio for more information. - if(client!=null && mGoogleApiClient!=null){ + + //usk comment + /* if(client!=null && mGoogleApiClient!=null){ AppIndex.AppIndexApi.end(client, getIndexApiAction()); if (mGoogleApiClient.isConnected()) { mGoogleApiClient.disconnect(); @@ -451,7 +453,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb // See https://g.co/AppIndexing/AndroidStudio for more information. client.disconnect(); - } + }*/ } @@ -609,8 +611,11 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb /** * ATTENTION: This was auto-generated to implement the App Indexing API. * See https://g.co/AppIndexing/AndroidStudio for more information. + * @return */ - public Action getIndexApiAction() { + + //usk comment + /* public com.google.android.gms.appindexing.Action getIndexApiAction() { Thing object = new Thing.Builder() .setName("GeoTag Page") // TODO: Define a title for the content shown. // TODO: Make sure this auto-generated URL is correct. @@ -620,7 +625,7 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb .setObject(object) .setActionStatus(Action.STATUS_TYPE_COMPLETED) .build(); - } + }*/ public class GeoTagUpload extends AsyncTask { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java index c2e1092..daee89a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java @@ -7,12 +7,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -22,6 +16,14 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index 22e80b3..e4fa024 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -20,11 +20,6 @@ import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; import android.text.TextUtils; import android.view.KeyEvent; import android.view.View; @@ -39,6 +34,11 @@ import android.widget.TextView; import android.widget.Toast; //import com.crashlytics.android.Crashlytics; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.api.GoogleApiClient; @@ -52,9 +52,9 @@ import com.google.android.gms.location.LocationSettingsRequest; import com.google.android.gms.location.LocationSettingsResult; import com.google.android.gms.location.LocationSettingsStatusCodes; import com.google.android.gms.maps.model.LatLng; +import com.google.android.material.snackbar.Snackbar; import com.google.firebase.analytics.FirebaseAnalytics; -import com.google.firebase.perf.FirebasePerformance; -import com.google.firebase.perf.metrics.Trace; + import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -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 @@ -160,15 +160,10 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - myTrace = FirebasePerformance.getInstance().newTrace("test_trace"); - myTrace.start(); - setContentView(R.layout.activity_login); - context = this; - // Obtain the FirebaseAnalytics instance. - mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); + // mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); // Fabric.with(this, new Crashlytics()); @@ -228,8 +223,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. //Kenya // museridView.setText("test.Kenya"); - museridView.setText("testkenya"); - mPasswordView.setText("cpm123"); + /*museridView.setText("testkenya"); + mPasswordView.setText("cpm123");*/ mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() { @Override public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) { @@ -645,7 +640,7 @@ 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); @@ -715,7 +710,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. super.onPostExecute(result); //Stop performance trace - myTrace.stop(); + /// myTrace.stop(); if (result.equals(CommonString.KEY_SUCCESS)) { @@ -1053,6 +1048,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); checkAppPermission(Manifest.permission.CAMERA, MY_PERMISSIONS_REQUEST_CAMERA); /*if (requestCode == PERMISSIONS_REQUEST_READ_PHONE_STATE diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 297f947..532132d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -13,15 +13,6 @@ import android.net.NetworkInfo; import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.design.widget.NavigationView; -import android.support.design.widget.Snackbar; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -33,6 +24,17 @@ import android.widget.TextView; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; + +import com.google.android.material.navigation.NavigationView; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.util.ArrayList; @@ -705,6 +707,7 @@ public class MainActivity extends AppCompatActivity @Override public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); switch (requestCode) { case MY_PERMISSIONS_REQUEST_CAMERA: { // If request is cancelled, the result arrays are empty. diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java index f334d10..0798b86 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java @@ -8,13 +8,14 @@ import android.content.res.Resources; import android.graphics.Color; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.View; import android.widget.Button; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; import com.google.gson.Gson; import java.util.ArrayList; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java index 67087be..288e23d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SplashScreenActivity.java @@ -6,7 +6,6 @@ import android.graphics.PixelFormat; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.Window; import android.view.animation.Animation; @@ -14,6 +13,8 @@ import android.view.animation.AnimationUtils; import android.widget.ImageView; import android.widget.LinearLayout; +import androidx.appcompat.app.AppCompatActivity; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/ListAdapter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/ListAdapter.java index bf16c88..2812a42 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/ListAdapter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/ListAdapter.java @@ -2,7 +2,6 @@ package cpm.com.gskmtorange.adapter; import android.content.ClipData; import android.os.Build; -import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -11,6 +10,8 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import java.util.List; import cpm.com.gskmtorange.R; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/MyAdapter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/MyAdapter.java index 2cd0eb3..1142a1c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/MyAdapter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/adapter/MyAdapter.java @@ -1,8 +1,6 @@ package cpm.com.gskmtorange.adapter; import android.content.Context; -import android.support.v7.widget.CardView; -import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -11,6 +9,9 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.RecyclerView; + import java.util.Collections; import java.util.List; 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 5e5e2b7..e7260dd 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java @@ -14,12 +14,13 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.FileProvider; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/blurlockview/BigButtonView.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/blurlockview/BigButtonView.java index 89ff2e7..4dc4e49 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/blurlockview/BigButtonView.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/blurlockview/BigButtonView.java @@ -4,7 +4,6 @@ import android.animation.ObjectAnimator; import android.content.Context; import android.content.res.Resources; import android.graphics.Typeface; -import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.util.TypedValue; import android.view.Gravity; @@ -15,6 +14,8 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.TextView; +import androidx.core.content.ContextCompat; + import cpm.com.gskmtorange.R; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/blurlockview/BlurLockView.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/blurlockview/BlurLockView.java index 36b3e29..8e0163d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/blurlockview/BlurLockView.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/blurlockview/BlurLockView.java @@ -9,7 +9,6 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Point; import android.graphics.Typeface; -import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.view.Display; import android.view.LayoutInflater; @@ -20,6 +19,8 @@ import android.widget.LinearLayout; import android.widget.TextView; +import androidx.core.content.ContextCompat; + import java.util.Stack; import cpm.com.gskmtorange.R; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/blurlockview/SmallButtonView.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/blurlockview/SmallButtonView.java index b72be2e..017751e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/blurlockview/SmallButtonView.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/blurlockview/SmallButtonView.java @@ -4,7 +4,6 @@ import android.animation.ObjectAnimator; import android.content.Context; import android.content.res.Resources; import android.graphics.Typeface; -import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.util.TypedValue; import android.view.LayoutInflater; @@ -14,6 +13,8 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.TextView; +import androidx.core.content.ContextCompat; + import cpm.com.gskmtorange.R; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalPromoSKUwiseActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalPromoSKUwiseActivity.java index f3a6b36..9f14ff3 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalPromoSKUwiseActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalPromoSKUwiseActivity.java @@ -14,13 +14,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -38,6 +31,15 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.FileProvider; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java index 000c4a5..82c2f28 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -20,12 +20,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; import android.view.MenuItem; @@ -47,6 +41,14 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; +import androidx.core.content.FileProvider; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AuditActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AuditActivity.java index 733c9c2..e788b83 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AuditActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AuditActivity.java @@ -14,14 +14,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; import android.view.MenuItem; @@ -37,6 +29,16 @@ import android.widget.RelativeLayout; import android.widget.Spinner; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; +import androidx.core.content.FileProvider; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java index 61a5d0c..b973f57 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java @@ -14,11 +14,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; import android.view.MenuItem; @@ -30,6 +25,13 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.FileProvider; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java index 6b0ca12..671745d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java @@ -10,15 +10,14 @@ import android.content.res.Resources; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; import org.ksoap2.serialization.SoapSerializationEnvelope; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java index 0a917d4..e073806 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CoachingVisitActivity.java @@ -1,5 +1,6 @@ package cpm.com.gskmtorange.dailyentry; +import android.annotation.SuppressLint; import android.content.ActivityNotFoundException; import android.content.Intent; import android.content.SharedPreferences; @@ -10,11 +11,7 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; + import android.util.Log; import android.view.MenuItem; import android.view.View; @@ -24,12 +21,17 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.Toast; +//import com.crashlytics.android.Crashlytics; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.FileProvider; import com.androidbuts.multispinnerfilter.KeyPairBoolData; import com.androidbuts.multispinnerfilter.MultiSpinnerSearch; import com.androidbuts.multispinnerfilter.SpinnerListener; -//import com.crashlytics.android.Crashlytics; - +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -415,6 +417,7 @@ public class CoachingVisitActivity extends AppCompatActivity implements AdapterV } } + @SuppressLint("MissingSuperCall") @SuppressWarnings("deprecation") @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CompetitionPromoActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CompetitionPromoActivity.java index adc066e..521d387 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CompetitionPromoActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CompetitionPromoActivity.java @@ -13,13 +13,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; import android.view.MenuItem; @@ -34,6 +27,15 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.FileProvider; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java index 3feb121..460a68e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ConversationActivity.java @@ -9,13 +9,6 @@ import android.content.SharedPreferences; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -29,6 +22,15 @@ import android.widget.TextView; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; import org.ksoap2.serialization.SoapSerializationEnvelope; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitIndicatorWebActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitIndicatorWebActivity.java index afd1ed5..10af11b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitIndicatorWebActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitIndicatorWebActivity.java @@ -5,15 +5,17 @@ import android.content.SharedPreferences; import android.graphics.Bitmap; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.webkit.WebView; import android.webkit.WebViewClient; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonFunctions; import cpm.com.gskmtorange.constant.CommonString; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitProductsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitProductsActivity.java index 6827a49..6fa685f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitProductsActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitProductsActivity.java @@ -13,13 +13,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; import android.view.MenuItem; @@ -35,6 +28,15 @@ import android.widget.SpinnerAdapter; import android.widget.TextView; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.FileProvider; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java index a40a525..2927c98 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CreateSelfActivity.java @@ -10,13 +10,6 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -29,6 +22,14 @@ import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.util.ArrayList; import cpm.com.gskmtorange.Database.GSKOrangeDB; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java index d10fb50..b701d10 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallActivity.java @@ -9,13 +9,6 @@ import android.content.SharedPreferences; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -25,6 +18,15 @@ import android.widget.TextView; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; import org.ksoap2.serialization.SoapSerializationEnvelope; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java index 786e623..121fde2 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/DeliveryCallAddStoreActivity.java @@ -1,6 +1,7 @@ package cpm.com.gskmtorange.dailyentry; import android.Manifest; +import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; import android.content.ActivityNotFoundException; @@ -18,15 +19,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.provider.Settings; -import android.support.design.widget.BaseTransientBottomBar; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.View; import android.widget.EditText; @@ -34,6 +26,12 @@ import android.widget.ImageView; import android.widget.Toast; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.core.content.FileProvider; + import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.api.GoogleApiClient; @@ -46,6 +44,8 @@ import com.google.android.gms.location.LocationServices; import com.google.android.gms.location.LocationSettingsRequest; import com.google.android.gms.location.LocationSettingsResult; import com.google.android.gms.location.LocationSettingsStatusCodes; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; import java.io.File; import java.util.List; @@ -399,6 +399,7 @@ public class DeliveryCallAddStoreActivity extends AppCompatActivity implements V } } + @SuppressLint("MissingSuperCall") @SuppressWarnings("deprecation") @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/First2Fragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/First2Fragment.java index 7819824..203e7a2 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/First2Fragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/First2Fragment.java @@ -5,9 +5,8 @@ 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.annotation.NonNull; +import androidx.fragment.app.Fragment; import androidx.navigation.fragment.NavHostFragment; import cpm.com.gskmtorange.R; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FirstFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FirstFragment.java index dad3858..41a75b3 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FirstFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FirstFragment.java @@ -5,9 +5,8 @@ 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.annotation.NonNull; +import androidx.fragment.app.Fragment; import androidx.navigation.fragment.NavHostFragment; import cpm.com.gskmtorange.R; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java index c2b675f..373e3e1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/FutureJCPActivity.java @@ -9,12 +9,6 @@ import android.content.res.Resources; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -26,6 +20,14 @@ import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import org.ksoap2.SoapEnvelope; import org.ksoap2.SoapFault; import org.ksoap2.serialization.SoapObject; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java index 1bb2e63..8644cc6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/MessageActivity.java @@ -8,12 +8,6 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -26,6 +20,13 @@ import android.widget.Toast; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import org.ksoap2.SoapEnvelope; import org.ksoap2.SoapFault; import org.ksoap2.serialization.SoapObject; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NewStockDataActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NewStockDataActivity.java index 39c7bd0..86b55ee 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NewStockDataActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NewStockDataActivity.java @@ -16,11 +16,6 @@ import android.graphics.Typeface; import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.Toolbar; import android.text.InputFilter; import android.text.Spanned; import android.util.Log; @@ -45,6 +40,13 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java index daed516..431a91d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NoCameraActivity.java @@ -10,14 +10,9 @@ import android.graphics.BitmapFactory; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; + import android.os.Bundle; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; + import android.view.DragEvent; import android.view.Menu; import android.view.MenuInflater; @@ -40,6 +35,15 @@ import android.widget.ScrollView; import android.widget.Spinner; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java index 5364196..125ae29 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -1,5 +1,6 @@ package cpm.com.gskmtorange.dailyentry; +import android.annotation.SuppressLint; import android.app.AlertDialog; import android.app.Dialog; import android.content.ActivityNotFoundException; @@ -15,9 +16,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.MenuItem; import android.view.View; @@ -36,6 +34,10 @@ import android.widget.Toast; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.FileProvider; + import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; import org.ksoap2.serialization.SoapSerializationEnvelope; @@ -363,6 +365,7 @@ public class NonWorkingReason extends AppCompatActivity implements } + @SuppressLint("MissingSuperCall") @SuppressWarnings("deprecation") @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java index 59e44da..256bcf0 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java @@ -9,11 +9,6 @@ import android.content.SharedPreferences; import android.graphics.Typeface; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.Toolbar; import android.text.InputFilter; import android.view.LayoutInflater; import android.view.MenuItem; @@ -33,6 +28,13 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PlanogramPDFActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PlanogramPDFActivity.java index 63106f7..9769ed1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PlanogramPDFActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PlanogramPDFActivity.java @@ -1,5 +1,6 @@ package cpm.com.gskmtorange.dailyentry; +import android.annotation.SuppressLint; import android.app.Dialog; import android.content.ActivityNotFoundException; import android.content.Context; @@ -12,13 +13,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.design.widget.BaseTransientBottomBar; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; + import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -31,6 +26,15 @@ import android.widget.Toast; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.BaseTransientBottomBar; +import com.google.android.material.snackbar.Snackbar; + import org.ksoap2.SoapEnvelope; import org.ksoap2.SoapFault; import org.ksoap2.serialization.SoapObject; @@ -241,6 +245,7 @@ public class PlanogramPDFActivity extends AppCompatActivity { return resultHttp; } + @SuppressLint("WrongConstant") @Override protected void onPostExecute(String result) { super.onPostExecute(result); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/Second2Fragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/Second2Fragment.java index 7acc63e..5144776 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/Second2Fragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/Second2Fragment.java @@ -5,9 +5,8 @@ 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.annotation.NonNull; +import androidx.fragment.app.Fragment; import androidx.navigation.fragment.NavHostFragment; import cpm.com.gskmtorange.R; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SecondFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SecondFragment.java index 2475eb9..6a4c2d8 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SecondFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SecondFragment.java @@ -5,9 +5,8 @@ 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.annotation.NonNull; +import androidx.fragment.app.Fragment; import androidx.navigation.fragment.NavHostFragment; import cpm.com.gskmtorange.R; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java index f0debfe..a986610 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/ServiceActivity.java @@ -6,13 +6,15 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.util.Locale; import cpm.com.gskmtorange.R; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java index 393ac0b..bf83186 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/SettingsActivity.java @@ -9,13 +9,15 @@ import android.content.res.Resources; import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.util.Locale; import cpm.com.gskmtorange.MainActivity; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockActivity.java index 8bd8b87..08a6110 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockActivity.java @@ -7,11 +7,6 @@ import android.content.SharedPreferences; import android.graphics.Typeface; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -26,6 +21,13 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java index b2974e7..227c872 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java @@ -11,11 +11,6 @@ import android.graphics.BitmapFactory; import android.graphics.Typeface; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.Toolbar; import android.text.InputFilter; import android.view.LayoutInflater; import android.view.MenuItem; @@ -36,6 +31,13 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.text.DecimalFormat; import java.util.ArrayList; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java index 3a93bce..fd00c04 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java @@ -7,11 +7,6 @@ import android.content.SharedPreferences; import android.graphics.Typeface; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.Toolbar; import android.text.InputFilter; import android.view.LayoutInflater; import android.view.View; @@ -28,6 +23,13 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java index 9fdd3e5..807d454 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java @@ -1,5 +1,6 @@ package cpm.com.gskmtorange.dailyentry; +import android.annotation.SuppressLint; import android.app.AlertDialog; import android.app.Dialog; import android.content.ActivityNotFoundException; @@ -20,10 +21,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.MenuItem; import android.view.View; @@ -33,6 +30,11 @@ import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.ContextCompat; +import androidx.core.content.FileProvider; + import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.api.GoogleApiClient; import com.google.android.gms.location.LocationServices; @@ -344,7 +346,7 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie @Override public void onConnected(Bundle bundle) { - Location mLastLocation = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient); + @SuppressLint("MissingPermission") Location mLastLocation = LocationServices.FusedLocationApi.getLastLocation(mGoogleApiClient); if (mLastLocation != null) { lat = String.valueOf(mLastLocation.getLatitude()); lon = String.valueOf(mLastLocation.getLongitude()); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java index 9979cc4..eba8231 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -22,15 +22,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.Settings; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -48,6 +39,14 @@ import android.widget.TextView; import android.widget.Toast; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.api.GoogleApiClient; @@ -61,6 +60,8 @@ import com.google.android.gms.location.LocationSettingsRequest; import com.google.android.gms.location.LocationSettingsResult; import com.google.android.gms.location.LocationSettingsStatusCodes; import com.google.android.gms.maps.model.LatLng; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java index c75639b..4e06ed5 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreimageActivity.java @@ -23,11 +23,6 @@ import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; import android.provider.Settings; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.MenuItem; import android.view.View; @@ -38,6 +33,12 @@ import android.widget.TextView; import android.widget.Toast; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.core.content.FileProvider; + import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.api.GoogleApiClient; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 0429bf3..1040da4 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -21,13 +21,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; import android.view.MenuItem; @@ -51,6 +44,15 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.FileProvider; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java index d5ce49e..25302a8 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2pBrand_Avaibility.java @@ -12,13 +12,6 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -31,6 +24,14 @@ import android.widget.RelativeLayout; import android.widget.Spinner; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index b6d54ce..22d494a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -9,14 +9,15 @@ import android.graphics.drawable.ColorDrawable; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.Window; import android.widget.ProgressBar; import android.widget.TextView; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; import org.ksoap2.serialization.SoapSerializationEnvelope; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fileprovider/GenericFileProvider.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fileprovider/GenericFileProvider.java index 9c91195..c49582c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fileprovider/GenericFileProvider.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fileprovider/GenericFileProvider.java @@ -2,7 +2,9 @@ package cpm.com.gskmtorange.fileprovider; import android.database.Cursor; import android.net.Uri; -import android.support.v4.content.FileProvider; + +import androidx.core.content.FileProvider; + public class GenericFileProvider extends FileProvider { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java index c12e24e..87552d8 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SelectLanguageFragment.java @@ -8,12 +8,13 @@ import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.fragment.app.Fragment; + import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java index 7c40459..eb679d3 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/ServiceActivityFragment.java @@ -6,12 +6,6 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.CardView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -19,6 +13,12 @@ import android.widget.TextView; import android.widget.Toast; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.AlertDialog; +import androidx.cardview.widget.CardView; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.squareup.okhttp.MediaType; import com.squareup.okhttp.MultipartBuilder; import com.squareup.okhttp.RequestBody; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java index bbdeaf7..674e9ce 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/fragment/SettingsActivityFragment.java @@ -6,15 +6,16 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.app.Fragment; -import android.support.v7.widget.CardView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.cardview.widget.CardView; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; 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 337b9d4..ebbafa2 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 @@ -5,12 +5,6 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -20,6 +14,14 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java index 22dea0c..f9c437e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java @@ -7,11 +7,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -19,6 +14,13 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java index ada48a7..8d85a7f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java @@ -7,10 +7,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -20,6 +16,11 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index 63cceaf..62bb7ea 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -9,11 +9,6 @@ import android.content.res.Resources; import android.graphics.Typeface; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -32,6 +27,13 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java index 944b82d..3a39a74 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java @@ -16,11 +16,6 @@ import android.graphics.Typeface; import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.Toolbar; import android.text.InputFilter; import android.text.Spanned; import android.util.Log; @@ -45,6 +40,13 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java index cd77092..7b159c9 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java @@ -16,11 +16,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -40,6 +35,13 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.FileProvider; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java index f2ffb9c..cf33918 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java @@ -15,11 +15,6 @@ import android.graphics.Typeface; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -43,6 +38,12 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.util.ArrayList; import java.util.Collections; @@ -58,7 +59,8 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; -public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { +public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity +{ Button btn_addShelf, btn_addSKU; ExpandableListView expandableListView; String brand, brand_id, company_id, sub_category, sub_category_id; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index ab58545..ed82f0f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -25,12 +25,6 @@ import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.content.FileProvider; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.CardView; -import android.support.v7.widget.Toolbar; import android.text.Editable; import android.text.TextWatcher; import android.util.Log; @@ -56,6 +50,14 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.ToggleButton; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.cardview.widget.CardView; +import androidx.core.content.FileProvider; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import java.io.File; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java index ecaa86d..37500dd 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java @@ -7,11 +7,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -20,6 +15,13 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/DragListener.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/DragListener.java index 75c29b1..edb255c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/DragListener.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/DragListener.java @@ -1,12 +1,11 @@ package cpm.com.gskmtorange.listener; - -import android.support.v7.widget.CardView; -import android.support.v7.widget.RecyclerView; import android.view.DragEvent; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import java.util.ArrayList; import cpm.com.gskmtorange.R; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/Listener.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/Listener.java index 9d7b62d..eeaae55 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/Listener.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/listener/Listener.java @@ -1,10 +1,11 @@ package cpm.com.gskmtorange.listener; -import android.support.v7.widget.RecyclerView; import android.view.DragEvent; import android.view.View; import android.widget.ScrollView; +import androidx.recyclerview.widget.RecyclerView; + import java.util.ArrayList; import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/ChangePasswordActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/ChangePasswordActivity.java index c518ff9..316ef49 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/ChangePasswordActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/ChangePasswordActivity.java @@ -10,10 +10,6 @@ import android.graphics.drawable.ColorDrawable; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.text.Editable; import android.text.TextWatcher; import android.view.View; @@ -24,6 +20,12 @@ import android.widget.ImageView; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; import org.ksoap2.serialization.SoapSerializationEnvelope; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java index 0290264..691ff94 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java @@ -1,6 +1,7 @@ package cpm.com.gskmtorange.password; import android.Manifest; +import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -20,14 +21,8 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; import android.os.Environment; +import android.os.Trace; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.Gravity; import android.view.View; import android.view.Window; @@ -36,6 +31,11 @@ import android.widget.ImageView; import android.widget.Toast; //import com.crashlytics.android.Crashlytics; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GooglePlayServicesUtil; import com.google.android.gms.common.api.GoogleApiClient; @@ -49,9 +49,9 @@ import com.google.android.gms.location.LocationSettingsRequest; import com.google.android.gms.location.LocationSettingsResult; import com.google.android.gms.location.LocationSettingsStatusCodes; import com.google.android.gms.maps.model.LatLng; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; import com.google.firebase.analytics.FirebaseAnalytics; -import com.google.firebase.perf.FirebasePerformance; -import com.google.firebase.perf.metrics.Trace; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -107,7 +107,7 @@ public class MPinActivity extends AppCompatActivity implements LoginGetterSetter lgs = null; FirebaseAnalytics mFirebaseAnalytics; static int counter = 1; - Trace myTrace; + // Trace myTrace; private int versionCode; private static final int MY_PERMISSIONS_REQUEST_CAMERA = 10; @@ -141,9 +141,9 @@ public class MPinActivity extends AppCompatActivity implements setSupportActionBar(toolbar);*/ // Obtain the FirebaseAnalytics instance. - mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); - myTrace = FirebasePerformance.getInstance().newTrace("test_trace"); - myTrace.start(); + // mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); + // myTrace = FirebasePerformance.getInstance().newTrace("test_trace"); + // myTrace.start(); IS_PASSWORD_CHECK = getIntent().getBooleanExtra(CommonString.IS_PASSWORD_CHECK, false); @@ -719,7 +719,7 @@ public class MPinActivity extends AppCompatActivity implements 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); @@ -789,7 +789,7 @@ public class MPinActivity extends AppCompatActivity implements super.onPostExecute(result); //Stop performance trace - myTrace.stop(); + // myTrace.stop(); if (result.equals(CommonString.KEY_SUCCESS)) { @@ -1049,6 +1049,7 @@ public class MPinActivity extends AppCompatActivity implements @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); checkAppPermission(Manifest.permission.CAMERA, MY_PERMISSIONS_REQUEST_CAMERA); /*if (requestCode == PERMISSIONS_REQUEST_READ_PHONE_STATE @@ -1059,9 +1060,9 @@ public class MPinActivity extends AppCompatActivity implements */ if (Build.VERSION.SDK_INT >= 23 && ContextCompat.checkSelfPermission(getApplicationContext(), - android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && + Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission(getApplicationContext(), - android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) { + Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) { return; } @@ -1136,6 +1137,7 @@ public class MPinActivity extends AppCompatActivity implements } + @SuppressLint("MissingPermission") protected void startLocationUpdates() { if (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/MSLFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/MSLFragment.java index 77790c1..1d1be43 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/MSLFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/MSLFragment.java @@ -15,10 +15,6 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.Fragment; -import android.support.v4.content.FileProvider; -import android.support.v7.widget.CardView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -35,6 +31,12 @@ import android.widget.RadioGroup; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.cardview.widget.CardView; +import androidx.core.content.FileProvider; +import androidx.fragment.app.Fragment; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivity.java index efa19f2..7690249 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivity.java @@ -5,13 +5,15 @@ import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.View; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.fragment.app.Fragment; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; + import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivityFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivityFragment.java index b464bf8..c21a111 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivityFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/PharmaActivityFragment.java @@ -1,11 +1,11 @@ package cpm.com.gskmtorange.pharma_stores; - -import android.support.v4.app.Fragment; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.fragment.app.Fragment; + import cpm.com.gskmtorange.R; /** diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/SOSFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/SOSFragment.java index 5c782f7..98fd848 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/SOSFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/SOSFragment.java @@ -7,18 +7,20 @@ import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.Fragment; -import android.support.v7.widget.CardView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.EditText; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.cardview.widget.CardView; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import java.util.ArrayList; import java.util.List; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/StoreDetailFragment.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/StoreDetailFragment.java index a10f0fb..ff868a5 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/StoreDetailFragment.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/pharma_stores/StoreDetailFragment.java @@ -14,10 +14,7 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.MediaStore; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.Fragment; -import android.support.v4.content.FileProvider; -import android.support.v7.widget.CardView; + import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -33,6 +30,12 @@ import android.widget.RadioGroup; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.cardview.widget.CardView; +import androidx.core.content.FileProvider; +import androidx.fragment.app.Fragment; + +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/service/FCMNotificationService.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/service/FCMNotificationService.java index b01fd34..255f141 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/service/FCMNotificationService.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/service/FCMNotificationService.java @@ -10,9 +10,10 @@ import android.media.RingtoneManager; import android.net.Uri; import android.os.Build; import android.os.IBinder; -import android.support.v4.app.NotificationCompat; import android.util.Log; +import androidx.core.app.NotificationCompat; + import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListMapActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListMapActivity.java index f32dee2..dce9221 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListMapActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListMapActivity.java @@ -1,12 +1,13 @@ package cpm.com.gskmtorange.storeinmap; import android.graphics.Bitmap; -import android.support.v4.app.FragmentActivity; import android.os.Bundle; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.fragment.app.FragmentActivity; + import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListRouteActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListRouteActivity.java index 2650da2..4881c7e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListRouteActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreListRouteActivity.java @@ -4,13 +4,14 @@ import android.graphics.Bitmap; import android.graphics.Color; import android.location.Location; import android.os.AsyncTask; -import android.support.v4.app.FragmentActivity; import android.os.Bundle; import android.util.Log; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.fragment.app.FragmentActivity; + import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreRouteActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreRouteActivity.java index 03e0625..865ff86 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreRouteActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreRouteActivity.java @@ -7,19 +7,19 @@ import android.graphics.Color; import android.location.Location; import android.net.Uri; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.FragmentActivity; import android.os.Bundle; -import android.support.v4.content.ContextCompat; import android.util.Log; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.FragmentActivity; + import com.google.android.gms.appindexing.Action; import com.google.android.gms.appindexing.AppIndex; import com.google.android.gms.appindexing.Thing; @@ -38,6 +38,7 @@ import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.LatLngBounds; import com.google.android.gms.maps.model.MarkerOptions; import com.google.android.gms.maps.model.PolylineOptions; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import org.json.JSONObject; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java index b1fe661..47b787a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -10,13 +10,14 @@ import android.graphics.BitmapFactory; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; import android.view.WindowManager; import android.widget.ProgressBar; import android.widget.TextView; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.AppCompatActivity; + import org.ksoap2.SoapEnvelope; import org.ksoap2.serialization.SoapObject; import org.ksoap2.serialization.SoapSerializationEnvelope; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index 3cd5b17..4908d5d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -13,14 +13,15 @@ import android.graphics.RectF; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.WindowManager; import android.widget.ProgressBar; import android.widget.TextView; //import com.crashlytics.android.Crashlytics; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + import com.google.gson.JsonSyntaxException; import com.squareup.okhttp.MultipartBuilder; import com.squareup.okhttp.RequestBody; diff --git a/GSKMTOrange/src/main/res/layout/activity_additional_promo_skuwise.xml b/GSKMTOrange/src/main/res/layout/activity_additional_promo_skuwise.xml index f2bfc6b..3ec5b77 100644 --- a/GSKMTOrange/src/main/res/layout/activity_additional_promo_skuwise.xml +++ b/GSKMTOrange/src/main/res/layout/activity_additional_promo_skuwise.xml @@ -1,5 +1,5 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_audit.xml b/GSKMTOrange/src/main/res/layout/activity_audit.xml index 3b37644..edd975f 100644 --- a/GSKMTOrange/src/main/res/layout/activity_audit.xml +++ b/GSKMTOrange/src/main/res/layout/activity_audit.xml @@ -1,5 +1,5 @@ - - - - + - - + diff --git a/GSKMTOrange/src/main/res/layout/activity_category_list.xml b/GSKMTOrange/src/main/res/layout/activity_category_list.xml index 37effb2..8337828 100644 --- a/GSKMTOrange/src/main/res/layout/activity_category_list.xml +++ b/GSKMTOrange/src/main/res/layout/activity_category_list.xml @@ -1,27 +1,27 @@ - - - - + - - + diff --git a/GSKMTOrange/src/main/res/layout/activity_category_picture.xml b/GSKMTOrange/src/main/res/layout/activity_category_picture.xml index 6542273..790a748 100644 --- a/GSKMTOrange/src/main/res/layout/activity_category_picture.xml +++ b/GSKMTOrange/src/main/res/layout/activity_category_picture.xml @@ -1,5 +1,5 @@ - - - - + - - + diff --git a/GSKMTOrange/src/main/res/layout/activity_category_wise_performance.xml b/GSKMTOrange/src/main/res/layout/activity_category_wise_performance.xml index 9eebe81..bfc9fe3 100644 --- a/GSKMTOrange/src/main/res/layout/activity_category_wise_performance.xml +++ b/GSKMTOrange/src/main/res/layout/activity_category_wise_performance.xml @@ -1,28 +1,28 @@ - - - - + - - + diff --git a/GSKMTOrange/src/main/res/layout/activity_change_password.xml b/GSKMTOrange/src/main/res/layout/activity_change_password.xml index 20fa228..d905618 100644 --- a/GSKMTOrange/src/main/res/layout/activity_change_password.xml +++ b/GSKMTOrange/src/main/res/layout/activity_change_password.xml @@ -1,28 +1,28 @@ - - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_checkout.xml b/GSKMTOrange/src/main/res/layout/activity_checkout.xml index f4f9108..070602a 100644 --- a/GSKMTOrange/src/main/res/layout/activity_checkout.xml +++ b/GSKMTOrange/src/main/res/layout/activity_checkout.xml @@ -1,5 +1,5 @@ - - - - + @@ -31,4 +31,4 @@ android:layout_margin="@dimen/fab_margin" app:srcCompat="@android:drawable/ic_dialog_email" />--> - + diff --git a/GSKMTOrange/src/main/res/layout/activity_coaching_visit.xml b/GSKMTOrange/src/main/res/layout/activity_coaching_visit.xml index 8873c52..0522ae0 100644 --- a/GSKMTOrange/src/main/res/layout/activity_coaching_visit.xml +++ b/GSKMTOrange/src/main/res/layout/activity_coaching_visit.xml @@ -1,5 +1,5 @@ - - - - + - - - \ No newline at end of file + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_compition_promo.xml b/GSKMTOrange/src/main/res/layout/activity_compition_promo.xml index 8d1f6fd..31703a4 100644 --- a/GSKMTOrange/src/main/res/layout/activity_compition_promo.xml +++ b/GSKMTOrange/src/main/res/layout/activity_compition_promo.xml @@ -1,28 +1,28 @@ - - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_conversation.xml b/GSKMTOrange/src/main/res/layout/activity_conversation.xml index dd0c94b..b15aa17 100644 --- a/GSKMTOrange/src/main/res/layout/activity_conversation.xml +++ b/GSKMTOrange/src/main/res/layout/activity_conversation.xml @@ -1,5 +1,5 @@ - - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_counterfeit_indicator_web.xml b/GSKMTOrange/src/main/res/layout/activity_counterfeit_indicator_web.xml index eb08ddd..39bc8cc 100644 --- a/GSKMTOrange/src/main/res/layout/activity_counterfeit_indicator_web.xml +++ b/GSKMTOrange/src/main/res/layout/activity_counterfeit_indicator_web.xml @@ -1,28 +1,28 @@ - - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_counterfeit_products.xml b/GSKMTOrange/src/main/res/layout/activity_counterfeit_products.xml index d033fa1..9811851 100644 --- a/GSKMTOrange/src/main/res/layout/activity_counterfeit_products.xml +++ b/GSKMTOrange/src/main/res/layout/activity_counterfeit_products.xml @@ -1,28 +1,28 @@ - - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_create_self.xml b/GSKMTOrange/src/main/res/layout/activity_create_self.xml index 91b08b3..b49d141 100644 --- a/GSKMTOrange/src/main/res/layout/activity_create_self.xml +++ b/GSKMTOrange/src/main/res/layout/activity_create_self.xml @@ -1,5 +1,5 @@ - - - - + - - + diff --git a/GSKMTOrange/src/main/res/layout/activity_daily_data_menu.xml b/GSKMTOrange/src/main/res/layout/activity_daily_data_menu.xml index a2831fa..3f9b6f9 100644 --- a/GSKMTOrange/src/main/res/layout/activity_daily_data_menu.xml +++ b/GSKMTOrange/src/main/res/layout/activity_daily_data_menu.xml @@ -1,5 +1,5 @@ - - - - + - - + diff --git a/GSKMTOrange/src/main/res/layout/activity_delivery_call.xml b/GSKMTOrange/src/main/res/layout/activity_delivery_call.xml index e0f1172..52d9d32 100644 --- a/GSKMTOrange/src/main/res/layout/activity_delivery_call.xml +++ b/GSKMTOrange/src/main/res/layout/activity_delivery_call.xml @@ -1,5 +1,5 @@ - - - - + - - - \ No newline at end of file + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_delivery_call_add_store.xml b/GSKMTOrange/src/main/res/layout/activity_delivery_call_add_store.xml index bb59cb1..8e4cf56 100644 --- a/GSKMTOrange/src/main/res/layout/activity_delivery_call_add_store.xml +++ b/GSKMTOrange/src/main/res/layout/activity_delivery_call_add_store.xml @@ -1,5 +1,5 @@ - - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_download.xml b/GSKMTOrange/src/main/res/layout/activity_download.xml index 1e87505..3acacbe 100644 --- a/GSKMTOrange/src/main/res/layout/activity_download.xml +++ b/GSKMTOrange/src/main/res/layout/activity_download.xml @@ -1,5 +1,5 @@ - - - - + - + diff --git a/GSKMTOrange/src/main/res/layout/activity_future_jcp.xml b/GSKMTOrange/src/main/res/layout/activity_future_jcp.xml index fe4c674..8c9c6ed 100644 --- a/GSKMTOrange/src/main/res/layout/activity_future_jcp.xml +++ b/GSKMTOrange/src/main/res/layout/activity_future_jcp.xml @@ -1,5 +1,5 @@ - - - - + - + - - + diff --git a/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml b/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml index 97f52ea..3dea07f 100644 --- a/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml +++ b/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml @@ -1,5 +1,5 @@ - - - - + - - - + diff --git a/GSKMTOrange/src/main/res/layout/activity_login.xml b/GSKMTOrange/src/main/res/layout/activity_login.xml index 3b5bf25..382b140 100644 --- a/GSKMTOrange/src/main/res/layout/activity_login.xml +++ b/GSKMTOrange/src/main/res/layout/activity_login.xml @@ -47,7 +47,7 @@ - - - + - + android:singleLine="true" + tools:ignore="InvalidImeActionId" /> - +