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

promo text size

Browse Source
This commit is contained in:
gagangoel290
2017-05-04 16:52:14 +05:30
parent a0587de83e
commit 7a8623fd41
4 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/build.gradle
+2 -2
View File
@@ -15,8 +15,8 @@ android {
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 22 targetSdkVersion 22
versionCode 9 versionCode 10
versionName "2.2" versionName "2.3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java
+3 -2
View File
@@ -39,6 +39,7 @@ import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.logging.StreamHandler;
import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.R;
@@ -413,9 +414,9 @@ public class PromoComplianceActivity extends AppCompatActivity {
ArrayAdapter<String> sp_promo_adapter = new ArrayAdapter<>(PromoComplianceActivity.this, android.R.layout.simple_list_item_1); ArrayAdapter<String> sp_promo_adapter = new ArrayAdapter<>(PromoComplianceActivity.this, android.R.layout.simple_list_item_1);
for (int i = 0; i < promoSpinnerListData.size(); i++) { for (int i = 0; i < promoSpinnerListData.size(); i++) {
sp_promo_adapter.add(promoSpinnerListData.get(i).getPromo()); sp_promo_adapter.add(promoSpinnerListData.get(i).getPromo());
} }
sp_promo_adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); sp_promo_adapter.setDropDownViewResource(R.layout.spinner_text_view);
//sp_promo_adapter.setDropDownViewResource(R.layout.spinner_text_view);
sp_promo.setAdapter(sp_promo_adapter); sp_promo.setAdapter(sp_promo_adapter);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+2 -1
View File
@@ -1378,7 +1378,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i) db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i)
.getVisitDate(), CommonString.KEY_U); .getVisitDate(), CommonString.KEY_U);
db.deleteTableWithStoreID(coverageList.get(i).getStoreId()); //db.deleteTableWithStoreID(coverageList.get(i).getStoreId());
} }
data.value = 100; data.value = 100;
publishProgress(data); publishProgress(data);
@@ -1411,6 +1411,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
}*/ }*/
dialog.dismiss(); dialog.dismiss();
db.deleteAllTables();
if (result.contains(CommonString.KEY_SUCCESS)) { if (result.contains(CommonString.KEY_SUCCESS)) {
//db.deleteAllTables(); //db.deleteAllTables();
showAlert(getString(R.string.menu_upload_data)); showAlert(getString(R.string.menu_upload_data));
GSKMTOrange/src/main/res/layout/spinner_text_view.xml
+2 -7
View File
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:id="@android:id/text1"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="5dp" android:paddingBottom="5dp"
@@ -13,4 +9,3 @@
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="Text" android:text="Text"
android:textSize="15dp" /> android:textSize="15dp" />
</LinearLayout>