Merge pull request #1399 from RajaVamsi11/ObsoluteSDKCheck

refactor: removed Obsolete SDK_INT Version Checks
openMF · Jun 16, 2020 · 3059892 · 3059892
2 parents 9d13711 + 8d5f725
commit 3059892
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/...android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeFragment.java b/...android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargeFragment.java
@@ -8,7 +8,6 @@
  * Created by nellyk on 1/22/2016.
  */
 
-import android.os.Build;
 import android.os.Bundle;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.core.content.res.ResourcesCompat;
@@ -298,8 +297,7 @@ public void onPrepareOptionsMenu(Menu menu) {
                 ResourcesCompat.getDrawable(getResources(),
                         R.drawable.ic_add_white_24dp, null));
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
-            menuItemAddNewDocument.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        menuItemAddNewDocument.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         super.onPrepareOptionsMenu(menu);
     }
 

diff --git a/...d/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetFragment.java b/...d/src/main/java/com/mifos/mifosxdroid/online/collectionsheet/CollectionSheetFragment.java
@@ -6,7 +6,6 @@
 package com.mifos.mifosxdroid.online.collectionsheet;
 
 
-import android.os.Build;
 import android.os.Bundle;
 import androidx.fragment.app.Fragment;
 import android.util.Log;
@@ -125,28 +124,22 @@ public void onPrepareOptionsMenu(Menu menu) {
 //        mItemSearch.setIcon(new IconDrawable(getActivity(), MaterialIcons.md_search)
 //                .colorRes(Color.WHITE)
 //                .actionBarSize());
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            mItemSearch.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        }
+        mItemSearch.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
 
 
         MenuItem mItemRefresh = menu.add(Menu.NONE, MENU_ITEM_REFRESH, Menu.NONE, getString(R
                 .string.refresh));
         mItemRefresh.setIcon(new IconDrawable(getActivity(), MaterialIcons.md_refresh)
                 .colorRes(R.color.white)
                 .actionBarSize());
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            mItemRefresh.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        }
+        mItemRefresh.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         MenuItem mItemSave = menu.add(Menu.NONE, MENU_ITEM_SAVE, Menu.NONE, getString(R.string
                 .save));
         mItemSave.setIcon(new IconDrawable(getActivity(), MaterialIcons.md_save)
                 .colorRes(R.color.white)
                 .actionBarSize());
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            mItemSave.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        }
+        mItemSave.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
 
         super.onPrepareOptionsMenu(menu);

diff --git a/...android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListFragment.java b/...android/src/main/java/com/mifos/mifosxdroid/online/documentlist/DocumentListFragment.java
@@ -10,7 +10,6 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import androidx.annotation.NonNull;
@@ -342,8 +341,7 @@ public void onPrepareOptionsMenu(Menu menu) {
                 .setIcon(ContextCompat
                         .getDrawable(getActivity(), R.drawable.ic_add_white_24dp));
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
-            menuItemAddNewDocument.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        menuItemAddNewDocument.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         super.onPrepareOptionsMenu(menu);
     }
 

diff --git a/...sng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeFragment.java b/...sng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargeFragment.java
@@ -9,7 +9,6 @@
  */
 
 import android.content.Context;
-import android.os.Build;
 import android.os.Bundle;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -239,8 +238,7 @@ public void onPrepareOptionsMenu(Menu menu) {
         menuItemAddNewLoanCharge.setIcon(getResources().getDrawable(R.drawable
                 .ic_add_white_24dp));
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
-            menuItemAddNewLoanCharge.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        menuItemAddNewLoanCharge.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         super.onPrepareOptionsMenu(menu);
     }