Merge pull request #175 from SUPLA/develop

v2.3.41
SUPLA · Jun 11, 2020 · 191b817 · 191b817
2 parents fa76e51 + a6e003a
commit 191b817
Show file tree

Hide file tree

Showing 71 changed files with 1,775 additions and 1,377 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,6 @@ notifications:
 
 android:
   components:
-    - build-tools-28.0.3
+    - build-tools-29.0.3
     - android-28
     - extra
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.supla.android"
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionCode 95
-        versionName "2.3.40"
+        versionCode 96
+        versionName "2.3.41"
 
         sourceSets.main {
             jniLibs.srcDir 'src/main/libs'
@@ -39,7 +39,7 @@ android {
     lintOptions { checkReleaseBuilds false }
     testOptions { unitTests.returnDefaultValues = true }
 
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '29.0.3'
 }
 
 repositories {

diff --git a/app/src/main/java/org/supla/android/ChannelDetailEM.java b/app/src/main/java/org/supla/android/ChannelDetailEM.java
@@ -96,7 +96,6 @@ public class ChannelDetailEM extends DetailLayout implements View.OnClickListene
     private TextView tvPhaseReverseActiveEnergyBalanced;
     private TextView tvlPhaseReverseActiveEnergyBalanced;
     private ImageView emImgIcon;
-    private TextView tvChannelTitle;
     private Button btnPhase1;
     private Button btnPhase2;
     private Button btnPhase3;
@@ -178,7 +177,6 @@ protected void init() {
                 findViewById(R.id.emtv_lPhaseReverseActiveEnergyBalanced);
 
         emImgIcon = findViewById(R.id.emimgIcon);
-        tvChannelTitle = findViewById(R.id.emtv_ChannelTitle);
 
         llBalance = findViewById(R.id.emtv_llBalance);
         tvlBalance = findViewById(R.id.emtv_lBalance);
@@ -362,8 +360,6 @@ public void channelExtendedDataToViews(boolean setIcon) {
             emImgIcon.setImageBitmap(ImageCache.getBitmap(getContext(), channel.getImageIdx()));
         }
 
-        tvChannelTitle.setText(channel.getNotEmptyCaption(getContext()));
-
         ChannelExtendedValue cev = channel.getExtendedValue();
 
         setBtnBackground(btnPhase1, R.drawable.em_phase_btn_black);

diff --git a/app/src/main/java/org/supla/android/ChannelDetailIC.java b/app/src/main/java/org/supla/android/ChannelDetailIC.java
@@ -55,7 +55,6 @@ public class ChannelDetailIC extends DetailLayout implements SuplaRestApiClientT
     private ImpulseCounterChartHelper chartHelper;
     private DownloadImpulseCounterMeasurements dtm;
     private ProgressBar icProgress;
-    private TextView tvChannelTitle;
     private TextView tvMeterValue;
     private TextView tvCurrentConsumption;
     private TextView tvCurrentCost;
@@ -86,7 +85,6 @@ public ChannelDetailIC(Context context, AttributeSet attrs, int defStyleAttr, in
     protected void init() {
         super.init();
         icProgress = findViewById(R.id.icProgressBar);
-        tvChannelTitle = findViewById(R.id.ictv_ChannelTitle);
         tvMeterValue = findViewById(R.id.ictv_MeterValue);
         tvTotalCost = findViewById(R.id.ictv_TotalCost);
         tvCurrentConsumption = findViewById(R.id.ictv_CurrentConsumption);
@@ -130,7 +128,6 @@ public View inflateContentView() {
 
     private void channelExtendedDataToViews(boolean setIcon) {
         Channel channel = (Channel) getChannelFromDatabase();
-        tvChannelTitle.setText(channel.getNotEmptyCaption(getContext()));
 
         if (setIcon) {
             icImgIcon.setBackgroundColor(Color.TRANSPARENT);