From 5b85755788f272b33b4b9c49e25c7f14eb3965a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20Thie=C3=9Fen?= Date: Sat, 6 Feb 2016 11:54:12 +0100 Subject: [PATCH] =?UTF-8?q?@06.02.15=20Dennis=20Thie=C3=9Fen:=20Release=20?= =?UTF-8?q?1.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 +- .../org/deke/risk/riskahead/MainActivity.java | 69 +++++++++------- .../org/deke/risk/riskahead/MapsActivity.java | 16 ++-- .../deke/risk/riskahead/ReportWFActivity.java | 21 +++-- .../risk/riskahead/SubscriptionsActivity.java | 80 +++++++++++-------- .../risk/riskahead/helper/BaseActivity.java | 1 + .../riskahead/helper/NotificationService.java | 2 +- app/src/main/res/layout/activity_main.xml | 5 +- .../res/layout/fragment_profile_stats.xml | 3 +- 9 files changed, 121 insertions(+), 82 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 92d5077..577c62c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,9 +18,9 @@ android { defaultConfig { applicationId "org.deke.risk.riskahead" minSdkVersion 15 - targetSdkVersion 22 - versionCode 22 - versionName "1.8.7" + targetSdkVersion 20 + versionCode 23 + versionName "1.9" } buildTypes { release { diff --git a/app/src/main/java/org/deke/risk/riskahead/MainActivity.java b/app/src/main/java/org/deke/risk/riskahead/MainActivity.java index 1bf1443..e6181fe 100644 --- a/app/src/main/java/org/deke/risk/riskahead/MainActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/MainActivity.java @@ -7,6 +7,7 @@ import android.support.v4.content.ContextCompat; import android.util.Log; import android.view.View; import android.widget.Button; +import android.widget.ImageView; import android.widget.TextView; import com.android.volley.Request; @@ -32,7 +33,7 @@ public class MainActivity extends BaseActivity{ private final static String TAG = MainActivity.class.getSimpleName(); private Handler mHandler = new Handler(); - + private Handler handler; @Override protected void onCreate(Bundle savedInstanceState) { @@ -45,36 +46,48 @@ public class MainActivity extends BaseActivity{ } private void initButtons() { - Button report = (Button) findViewById(R.id.btn_main_report); - report.setOnClickListener(new View.OnClickListener() { + runOnUiThread(new Runnable() { @Override - public void onClick(View v) { - gotoReportActivity(); + public void run() { + ImageView bg = (ImageView) findViewById(R.id.imageView); + bg.setImageDrawable(ContextCompat.getDrawable(getApplicationContext(), R.drawable.bg_withlogo_2)); + + + Button report = (Button) findViewById(R.id.btn_main_report); + report.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + gotoReportActivity(); + } + }); + + Drawable reportIcon = new IconicsDrawable(getApplicationContext()) + .icon(GoogleMaterial.Icon.gmd_room) + .color(ContextCompat.getColor(getApplicationContext(), R.color.white)) + .sizeDp(24); + + report.setCompoundDrawables(reportIcon, null, null, null); + report.setBackgroundDrawable(ContextCompat.getDrawable(getApplicationContext(), R.drawable.activity_main_button)); + + Button map = (Button) findViewById(R.id.btn_main_viewmap); + + map.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + gotoMapActivity(); + } + }); + + Drawable mapIcon = new IconicsDrawable(getApplicationContext()) + .icon(GoogleMaterial.Icon.gmd_map) + .color(ContextCompat.getColor(getApplicationContext(), R.color.white)) + .sizeDp(24); + + map.setCompoundDrawables(null, null, mapIcon, null); + map.setBackgroundDrawable(ContextCompat.getDrawable(getApplicationContext(), R.drawable.activity_main_button)); + } }); - - Drawable reportIcon = new IconicsDrawable(this) - .icon(GoogleMaterial.Icon.gmd_room) - .color(ContextCompat.getColor(getApplicationContext(),R.color.white)) - .sizeDp(24); - - report.setCompoundDrawables(reportIcon, null, null, null); - - Button map = (Button) findViewById(R.id.btn_main_viewmap); - - map.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - gotoMapActivity(); - } - }); - - Drawable mapIcon = new IconicsDrawable(this) - .icon(GoogleMaterial.Icon.gmd_map) - .color(ContextCompat.getColor(getApplicationContext(), R.color.white)) - .sizeDp(24); - - map.setCompoundDrawables(null, null, mapIcon, null); } Runnable mHandlerTask = new Runnable() diff --git a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java index d24368a..a808088 100644 --- a/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/MapsActivity.java @@ -101,18 +101,13 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa super.onCreate(savedInstanceState); userHasToBeLoggedIn(); - navDrawer.setSelection(mapAvtivityID, false); - if(session.getSubsPremium()){ MIN_ZOOM_LEVEL = 7; }else{ MIN_ZOOM_LEVEL = 9; } - showAdd = true; - - MapFragment mapFragment = (MapFragment) getFragmentManager() - .findFragmentById(R.id.frag_maps_map); + MapFragment mapFragment = (MapFragment) getFragmentManager().findFragmentById(R.id.frag_maps_map); mapFragment.getMapAsync(this); findViewById(R.id.fab_reportwf_map).setVisibility(View.INVISIBLE); @@ -197,6 +192,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa @Override public void onClick(View v) { Log.d(TAG, "MARKED LOCATION: " + markedLocation.latitude + " " + markedLocation.longitude); + showAdd = false; gotoReportActivity(markedLocation.latitude + ":" + markedLocation.longitude); } }); @@ -314,6 +310,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa } private void addIncidentMarkersOnMap(JSONArray incidents){ + mClusterManager.clearItems(); for(int i = 0; i < incidents.length();i++){ @@ -752,6 +749,13 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa pbCounter++; } + @Override + protected void onResume(){ + super.onResume(); + navDrawer.setSelection(mapAvtivityID, false); + showAdd = true; + } + private void hideProgress(){ pbCounter--; if(pbCounter == 0){ diff --git a/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java b/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java index 6201211..cca761e 100644 --- a/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java @@ -24,6 +24,9 @@ import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.StringRequest; import com.beardedhen.androidbootstrap.BootstrapButton; +import com.beardedhen.androidbootstrap.api.attributes.BootstrapBrand; +import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapBrand; +import com.beardedhen.androidbootstrap.api.view.BootstrapBrandView; import com.google.android.gms.maps.model.LatLng; import com.google.gson.Gson; @@ -153,7 +156,6 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen transaction.commit(); if(state > 0){ - btnReportNow.setVisibility(View.VISIBLE); btnMap.setVisibility(View.GONE); } @@ -232,20 +234,25 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen @Override public void onInputFinished(boolean finished) { if(finished) { - if(currentState < fragList.size()-1) btnContinue.setVisibility(View.VISIBLE); findViewById(R.id.atvStatus).setVisibility(View.VISIBLE); + btnContinue.setBootstrapBrand(DefaultBootstrapBrand.SUCCESS); + }else{ - btnContinue.setVisibility(View.INVISIBLE); findViewById(R.id.atvStatus).setVisibility(View.INVISIBLE); + btnContinue.setBootstrapBrand(DefaultBootstrapBrand.REGULAR); } - if(finished && (currentState == 1)){ + if((currentState == 1 && finished) || (currentState > 1)){ btnReportNow.setVisibility(View.VISIBLE); - } else if (currentState > 1) { - btnReportNow.setVisibility(View.VISIBLE); - } else { + }else{ btnReportNow.setVisibility(View.INVISIBLE); } + + if(finished || currentState > 1){ + btnContinue.setVisibility(View.VISIBLE); + }else{ + btnContinue.setVisibility(View.INVISIBLE); + } } @Override diff --git a/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java b/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java index 501f636..fe4ceeb 100644 --- a/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java @@ -6,6 +6,7 @@ import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; import android.os.Bundle; +import android.os.Handler; import android.os.IBinder; import android.os.RemoteException; import android.support.v4.content.ContextCompat; @@ -47,46 +48,63 @@ public class SubscriptionsActivity extends BaseActivity{ Bundle querySkus; HashMap purchaseMap = new HashMap<>(); + ArrayList skuList = new ArrayList<>(); + HashMap dbItems = new HashMap<>(); ArrayList ownedSkus = new ArrayList<>(); + Handler handler; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); userHasToBeLoggedIn(); - tblBillings = (TableLayout) findViewById(R.id.tbl_billing); - - ServiceConnection mServiceConn = new ServiceConnection() { - @Override - public void onServiceDisconnected(ComponentName name) { - mService = null; - Log.d(TAG,"Disconnected from InApp Billing Service"); - } - - @Override - public void onServiceConnected(ComponentName name, - IBinder service) { - mService = IInAppBillingService.Stub.asInterface(service); - Log.d(TAG,"Connected to InApp Billing Service"); - - initBillingOptions(); - getAlreadyPurchasedItems(); - } - }; - - Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND"); - serviceIntent.setPackage("com.android.vending"); - bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE); - - ArrayList skuList = new ArrayList<>(); skuList.add("no_ads_01"); skuList.add("no_ads_02"); skuList.add("extra_functions_01"); skuList.add("extra_functions_02"); - querySkus = new Bundle(); - querySkus.putStringArrayList("ITEM_ID_LIST", skuList); + initBillingService(); + } + + private void initBillingService() { + tblBillings = (TableLayout) findViewById(R.id.tbl_billing); + handler = new Handler(); + + Thread thread = new Thread() { + @Override + public void run() { + + ServiceConnection mServiceConn = new ServiceConnection() { + @Override + public void onServiceDisconnected(ComponentName name) { + mService = null; + Log.d(TAG, "Disconnected from InApp Billing Service"); + } + + @Override + public void onServiceConnected(ComponentName name, + IBinder service) { + mService = IInAppBillingService.Stub.asInterface(service); + Log.d(TAG,"Connected to InApp Billing Service"); + + initBillingOptions(); + getAlreadyPurchasedItems(); + } + }; + + Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND"); + serviceIntent.setPackage("com.android.vending"); + bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE); + + querySkus = new Bundle(); + querySkus.putStringArrayList("ITEM_ID_LIST", skuList); + + } + }; + + thread.start(); } private void getAlreadyPurchasedItems() { @@ -126,13 +144,9 @@ public class SubscriptionsActivity extends BaseActivity{ } - ArrayList subs = new ArrayList<>(); - subs.add("extra_functions_01"); - subs.add("extra_functions_02"); - subs.add("no_ads_01"); - subs.add("no_ads_02"); - for(String sub : subs){ + + for(String sub : skuList){ boolean itemFound = false; if(dbItems != null && dbItems.containsKey(sub)){ diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java b/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java index b949bea..3dfd5e6 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java @@ -377,6 +377,7 @@ public abstract class BaseActivity extends AppCompatActivity { sendBroadcast(broadcastIntent); stopService(new Intent(BaseActivity.this, NotificationService.class)); + showAd(); finish(); } diff --git a/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java b/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java index eac8479..768a754 100644 --- a/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java +++ b/app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java @@ -206,7 +206,7 @@ public class NotificationService extends Service { } NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(getApplicationContext()) - .setSmallIcon(R.drawable.logo_riskahead) + .setSmallIcon(R.drawable.logo_380) .setAutoCancel(true) .setContentTitle(title) .setContentText(context); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1202b3b..d90f57d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,6 +4,7 @@ android:id="@+id/main_layout" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/black" tools:context=".MainActivity"> diff --git a/app/src/main/res/layout/fragment_profile_stats.xml b/app/src/main/res/layout/fragment_profile_stats.xml index 2312ce1..e5901bb 100644 --- a/app/src/main/res/layout/fragment_profile_stats.xml +++ b/app/src/main/res/layout/fragment_profile_stats.xml @@ -125,7 +125,8 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginTop="50dp" android:layout_above="@+id/txt_profile_membersince" - android:layout_centerHorizontal="true" + android:layout_centerInParent="true" + android:gravity="center_horizontal" android:textColor="@color/text_light_grey"/>