This commit is contained in:
CPM
2021-03-25 17:40:51 +05:30
parent 7ae36ff834
commit 72d0714a16
6 changed files with 17 additions and 18 deletions
Binary file not shown.
+8 -6
View File
@@ -5,7 +5,6 @@ apply plugin: 'com.google.firebase.crashlytics'
android { android {
compileSdkVersion 30 compileSdkVersion 30
buildToolsVersion '29.0.3' buildToolsVersion '29.0.3'
useLibrary 'org.apache.http.legacy' useLibrary 'org.apache.http.legacy'
lintOptions { lintOptions {
@@ -21,15 +20,15 @@ android {
defaultConfig { defaultConfig {
applicationId "cpm.com.gskmtorange" applicationId "cpm.com.gskmtorange"
minSdkVersion 20 minSdkVersion 20
targetSdkVersion 30 targetSdkVersion 29
/*//For Egypt /*//For Egypt
versionCode 31 versionCode 31
versionName "4.3"*/ versionName "4.3"*/
//For UAE //For UAE
/* versionCode 28 versionCode 28
versionName "4.0"*/ versionName "4.0"
//For Turkey //For Turkey
/* versionCode 26 /* versionCode 26
@@ -46,12 +45,15 @@ android {
/* versionCode 28 /* versionCode 28
versionName "3.9"*/ versionName "3.9"*/
//sa //sa
versionCode 23 versionCode 22
versionName "3.5" versionName "3.4"
//Kenya //Kenya
/* versionCode 2 /* versionCode 2
versionName "1.1"*/ versionName "1.1"*/
//nigeria
/* versionCode 1
versionName "1.0"*/
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+2 -9
View File
@@ -3,15 +3,6 @@
package="cpm.com.gskmtorange"> package="cpm.com.gskmtorange">
<!-- To auto-complete the email text field in the login form with the user's emails --> <!-- To auto-complete the email text field in the login form with the user's emails -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_PROFILE" /> <uses-permission android:name="android.permission.READ_PROFILE" />
@@ -22,6 +13,7 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
@@ -37,6 +29,7 @@
android:supportsRtl="true" android:supportsRtl="true"
android:requestLegacyExternalStorage="true" android:requestLegacyExternalStorage="true"
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity <activity
android:name=".dailyentry.NewStockDataActivity" android:name=".dailyentry.NewStockDataActivity"
@@ -96,8 +96,8 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
*/ */
public class GSKOrangeDB extends SQLiteOpenHelper { public class GSKOrangeDB extends SQLiteOpenHelper {
public static final String DATABASE_NAME = "GSK_ORANGE_DB616"; public static final String DATABASE_NAME = "GSK_ORANGE_DB617";
public static final int DATABASE_VERSION = 15; public static final int DATABASE_VERSION = 16;
TableBean tableBean; TableBean tableBean;
private SQLiteDatabase db; private SQLiteDatabase db;
Context context; Context context;
@@ -196,7 +196,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
mPasswordView.setText("cpm123");*/ mPasswordView.setText("cpm123");*/
//UAE //UAE
/* museridView.setText("testuae"); /* museridView.setText("testuae");
mPasswordView.setText("cpm123");*/ mPasswordView.setText("cpm123");*/
/* museridView.setText("testuae1"); /* museridView.setText("testuae1");
mPasswordView.setText("cpm123");*/ mPasswordView.setText("cpm123");*/
@@ -229,6 +229,10 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
/* museridView.setText("testuae1"); /* museridView.setText("testuae1");
mPasswordView.setText("cpm123");*/ mPasswordView.setText("cpm123");*/
//nig
// museridView.setText("test.nig");
/* museridView.setText("test.nigeria");
mPasswordView.setText("cpm@123");*/
mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() { mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override @Override
public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) { public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) {
Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB