diff --git a/app/src/main/java/com/dosse/airpods/pods/PodsStatus.java b/app/src/main/java/com/dosse/airpods/pods/PodsStatus.java index 9722bcd..337bd51 100644 --- a/app/src/main/java/com/dosse/airpods/pods/PodsStatus.java +++ b/app/src/main/java/com/dosse/airpods/pods/PodsStatus.java @@ -4,7 +4,7 @@ import com.dosse.airpods.pods.models.AirPods1; import com.dosse.airpods.pods.models.AirPods2; import com.dosse.airpods.pods.models.AirPods3; import com.dosse.airpods.pods.models.AirPodsMax; -import com.dosse.airpods.pods.models.AirPodsPro1; +import com.dosse.airpods.pods.models.AirPodsPro; import com.dosse.airpods.pods.models.AirPodsPro2; import com.dosse.airpods.pods.models.BeatsFlex; import com.dosse.airpods.pods.models.BeatsSolo3; @@ -80,9 +80,9 @@ public class PodsStatus { } else if ("1320".equals(idFull)) { pods = new AirPods3(leftPod, rightPod, casePod); // Airpods 3rd gen } else if ("0E20".equals(idFull)) { - pods = new AirPodsPro1(leftPod, rightPod, casePod); // Airpods Pro 1st gen + pods = new AirPodsPro(leftPod, rightPod, casePod); // Airpods Pro } else if ("1420".equals(idFull)) { - pods = new AirPodsPro2(leftPod, rightPod, casePod); // Airpods Pro 2st gen + pods = new AirPodsPro2(leftPod, rightPod, casePod); // Airpods Pro 2 } else if ('A' == idSingle) { pods = new AirPodsMax(singlePod); // Airpods Max } else if ('B' == idSingle) { diff --git a/app/src/main/java/com/dosse/airpods/pods/models/AirPodsPro1.java b/app/src/main/java/com/dosse/airpods/pods/models/AirPodsPro.java similarity index 80% rename from app/src/main/java/com/dosse/airpods/pods/models/AirPodsPro1.java rename to app/src/main/java/com/dosse/airpods/pods/models/AirPodsPro.java index ea7941d..e373adc 100644 --- a/app/src/main/java/com/dosse/airpods/pods/models/AirPodsPro1.java +++ b/app/src/main/java/com/dosse/airpods/pods/models/AirPodsPro.java @@ -3,9 +3,9 @@ package com.dosse.airpods.pods.models; import com.dosse.airpods.R; import com.dosse.airpods.pods.Pod; -public class AirPodsPro1 extends RegularPods { +public class AirPodsPro extends RegularPods { - public AirPodsPro1 (Pod leftPod, Pod rightPod, Pod casePod) { + public AirPodsPro (Pod leftPod, Pod rightPod, Pod casePod) { super(leftPod, rightPod, casePod); } @@ -26,7 +26,7 @@ public class AirPodsPro1 extends RegularPods { @Override public String getModel () { - return Constants.MODEL_AIRPODS_PRO_GEN1; + return Constants.MODEL_AIRPODS_PRO; } } \ No newline at end of file diff --git a/app/src/main/java/com/dosse/airpods/pods/models/AirPodsPro2.java b/app/src/main/java/com/dosse/airpods/pods/models/AirPodsPro2.java index d7be61b..3add7b2 100644 --- a/app/src/main/java/com/dosse/airpods/pods/models/AirPodsPro2.java +++ b/app/src/main/java/com/dosse/airpods/pods/models/AirPodsPro2.java @@ -26,7 +26,7 @@ public class AirPodsPro2 extends RegularPods { @Override public String getModel () { - return Constants.MODEL_AIRPODS_PRO_GEN2; + return Constants.MODEL_AIRPODS_PRO_2; } } \ No newline at end of file diff --git a/app/src/main/java/com/dosse/airpods/pods/models/Constants.java b/app/src/main/java/com/dosse/airpods/pods/models/Constants.java index 33f5cb6..b5e133d 100644 --- a/app/src/main/java/com/dosse/airpods/pods/models/Constants.java +++ b/app/src/main/java/com/dosse/airpods/pods/models/Constants.java @@ -4,8 +4,8 @@ public final class Constants { static final String MODEL_AIRPODS_GEN1 = "airpods1"; static final String MODEL_AIRPODS_GEN2 = "airpods2"; static final String MODEL_AIRPODS_GEN3 = "airpods3"; - static final String MODEL_AIRPODS_PRO_GEN1 = "airpodspro1"; - static final String MODEL_AIRPODS_PRO_GEN2 = "airpodspro2"; + static final String MODEL_AIRPODS_PRO = "airpodspro"; + static final String MODEL_AIRPODS_PRO_2 = "airpodspro2"; static final String MODEL_AIRPODS_MAX = "airpodsmax"; static final String MODEL_BEATS_X = "beatsx"; static final String MODEL_BEATS_FLEX = "beatsflex"; diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index 2d42e80..69af5c7 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -10,6 +10,7 @@ • אפל איירפודס דור שני • אפל איירפודס דור שלישי • אפל איירפודס פרו + • אפל איירפודס פרו 2 • אפל איירפודס מקס • ביטס אקס • ביטס פלקס diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 160d08a..a1be720 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -24,6 +24,7 @@ • Apple AirPods 2nd gen • Apple AirPods 3rd gen • Apple AirPods Pro + • Apple AirPods Pro 2 • Apple AirPods Max • Beats X • Beats Flex