Merge pull request #47 from ZafraniTechLLC/remove-round-icon

Removed old android round icon

Author: zafrani

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "tech.zafrani.companionforpubg"
         minSdkVersion 18
         targetSdkVersion 25
-        versionCode 3
-        versionName "0.0.3"
+        versionCode 4
+        versionName "0.0.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

app/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
         android:allowBackup="true"
         android:icon="@drawable/logo"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/logo"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name="tech.zafrani.companionforpubg.activities.MainActivity">

app/src/main/java/tech/zafrani/companionforpubg/adapters/viewholders/AmmunitionViewHolder.java

@@ -52,9 +52,6 @@ private void setItemCapacity(@Nullable final float itemCapacity) {
     private void setItemIcon(final String itemImage,@NonNull final String category) {
         if (itemImage != null) {
             Picasso.with(itemView.getContext()).load(Constants.ITEM_IMAGE_URL + category + "/" + itemImage + ARG_RAW).into(imageImageView);
-        }else {
-            Picasso.with(itemView.getContext()).load(R.mipmap.ic_launcher).into(imageImageView);
-
         }
     }
 

app/src/main/java/tech/zafrani/companionforpubg/adapters/viewholders/AttachmentsViewHolder.java

@@ -108,9 +108,6 @@ private void setItemReload(final float itemReload) {
     private void setItemIcon(final String itemImage,@NonNull final String category) {
         if (itemImage != null) {
             Picasso.with(itemView.getContext()).load(Constants.ITEM_IMAGE_URL + category + "/" + itemImage + ARG_RAW).into(imageImageView);
-        }else {
-            Picasso.with(itemView.getContext()).load(R.mipmap.ic_launcher).into(imageImageView);
-
         }
     }
 

app/src/main/java/tech/zafrani/companionforpubg/adapters/viewholders/ConsumablesViewHolder.java

@@ -98,9 +98,6 @@ private void setItemCapacity(@Nullable final float itemCapacity) {
     private void setItemIcon(final String itemImage, String category) {
         if (itemImage != null) {
             Picasso.with(itemView.getContext()).load(Constants.ITEM_IMAGE_URL + category + "/" + itemImage + ARG_RAW).into(imageImageView);
-        }else {
-            Picasso.with(itemView.getContext()).load(R.mipmap.ic_launcher).into(imageImageView);
-
         }
     }
 

app/src/main/java/tech/zafrani/companionforpubg/adapters/viewholders/EquipmentViewHolder.java

@@ -64,9 +64,6 @@ private void setItemProtection(@Nullable final float itemProtection) {
     private void setItemIcon(final String itemImage,@NonNull final String category) {
         if (itemImage != null) {
             Picasso.with(itemView.getContext()).load(Constants.ITEM_IMAGE_URL + category + "/" + itemImage + ARG_RAW).into(imageImageView);
-        }else {
-            Picasso.with(itemView.getContext()).load(R.mipmap.ic_launcher).into(imageImageView);
-
         }
     }
 

app/src/main/java/tech/zafrani/companionforpubg/adapters/viewholders/VehicleViewHolder.java

@@ -81,9 +81,6 @@ private void setItemSeats(@Nullable final float itemSeats) {
     private void setItemIcon(final String itemImage,@NonNull final String category) {
         if (itemImage != null) {
             Picasso.with(itemView.getContext()).load(Constants.ITEM_IMAGE_URL + category + "/" + itemImage + ARG_RAW).into(imageImageView);
-        }else {
-            Picasso.with(itemView.getContext()).load(R.mipmap.ic_launcher).into(imageImageView);
-
         }
     }
 

app/src/main/java/tech/zafrani/companionforpubg/adapters/viewholders/WeaponsViewHolder.java

@@ -118,9 +118,6 @@ private void setItemReload(@Nullable final float itemReload) {
     private void setItemIcon(final String itemImage,@NonNull final String category) {
         if (itemImage != null) {
             Picasso.with(itemView.getContext()).load(Constants.ITEM_IMAGE_URL + category + "/" + itemImage + ARG_RAW).into(imageImageView);
-        }else {
-            Picasso.with(itemView.getContext()).load(R.mipmap.ic_launcher).into(imageImageView);
-
         }
     }
 

app/src/main/res/layout/row_item_ammunition.xml

@@ -15,7 +15,6 @@
             android:id="@+id/row_item_icon"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:src="@mipmap/ic_launcher"
             android:layout_weight="0.2"/>
         <LinearLayout
             android:orientation="vertical"

app/src/main/res/layout/row_item_attachment.xml

@@ -15,7 +15,6 @@
             android:id="@+id/row_item_icon"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:src="@mipmap/ic_launcher"
             android:layout_weight="0.2"/>
         <LinearLayout
             android:orientation="vertical"

app/src/main/res/layout/row_item_consumables.xml

@@ -15,7 +15,6 @@
             android:id="@+id/row_item_icon"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:src="@mipmap/ic_launcher"
             android:layout_weight="0.2"/>
         <LinearLayout
             android:orientation="vertical"

app/src/main/res/layout/row_item_equipment.xml

@@ -15,7 +15,6 @@
             android:id="@+id/row_item_icon"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:src="@mipmap/ic_launcher"
             android:layout_weight="0.2"/>
         <LinearLayout
             android:orientation="vertical"

app/src/main/res/layout/row_item_vehicles.xml

@@ -15,7 +15,6 @@
             android:id="@+id/row_item_icon"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:src="@mipmap/ic_launcher"
             android:layout_weight="0.2"/>
         <LinearLayout
             android:orientation="vertical"

app/src/main/res/layout/row_item_weapon.xml

@@ -14,7 +14,6 @@
             android:id="@+id/row_item_icon"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:src="@mipmap/ic_launcher"
             android:layout_weight="0.2"/>
         <LinearLayout
             android:orientation="vertical"