Skip to content
Snippets Groups Projects
Commit 1305368c authored by Julian Catoni's avatar Julian Catoni
Browse files

Some fixes after upstream merge

parent da2acd55
Branches master
No related tags found
No related merge requests found
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
package org.openhab.habdroid.ui; package org.openhab.habdroid.ui;
import android.annotation.SuppressLint;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.app.PendingIntent; import android.app.PendingIntent;
...@@ -98,6 +99,7 @@ import org.openhab.habdroid.util.Util; ...@@ -98,6 +99,7 @@ import org.openhab.habdroid.util.Util;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
...@@ -454,6 +456,7 @@ public class MainActivity extends AbstractBaseActivity implements ...@@ -454,6 +456,7 @@ public class MainActivity extends AbstractBaseActivity implements
} }
} }
@SuppressLint("StringFormatInvalid")
@Override @Override
public void onAvailableConnectionChanged() { public void onAvailableConnectionChanged() {
Log.d(TAG, "onAvailableConnectionChanged()"); Log.d(TAG, "onAvailableConnectionChanged()");
...@@ -783,7 +786,7 @@ public class MainActivity extends AbstractBaseActivity implements ...@@ -783,7 +786,7 @@ public class MainActivity extends AbstractBaseActivity implements
recognitionsIntent.putExtra("serverProperties", mServerProperties); recognitionsIntent.putExtra("serverProperties", mServerProperties);
recognitionsIntent.putParcelableArrayListExtra("widgets", mWidgets); recognitionsIntent.putParcelableArrayListExtra("widgets", mWidgets);
startActivityForResult(recognitionsIntent, INFO_REQUEST_CODE); startActivityForResult(recognitionsIntent, INFO_REQUEST_CODE);
Util.overridePendingTransition(this, false); //Util.overridePendingTransition(this, false);
} }
private Sitemap selectConfiguredSitemapFromList() { private Sitemap selectConfiguredSitemapFromList() {
......
...@@ -56,7 +56,7 @@ public class RecognitionsActivity extends AppCompatActivity implements WidgetAda ...@@ -56,7 +56,7 @@ public class RecognitionsActivity extends AppCompatActivity implements WidgetAda
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
Util.setActivityTheme(this); //Util.setActivityTheme(this);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_recognitions); setContentView(R.layout.activity_recognitions);
...@@ -179,7 +179,7 @@ public class RecognitionsActivity extends AppCompatActivity implements WidgetAda ...@@ -179,7 +179,7 @@ public class RecognitionsActivity extends AppCompatActivity implements WidgetAda
@Override @Override
public void finish() { public void finish() {
super.finish(); super.finish();
Util.overridePendingTransition(this, true); //Util.overridePendingTransition(this, true);
} }
private void updateTitle() { private void updateTitle() {
...@@ -192,12 +192,12 @@ public class RecognitionsActivity extends AppCompatActivity implements WidgetAda ...@@ -192,12 +192,12 @@ public class RecognitionsActivity extends AppCompatActivity implements WidgetAda
} }
@Override @Override
public void onItemClicked(Widget item) { public boolean onItemClicked(Widget item) {
Toast.makeText(this, "onItemClicked", Toast.LENGTH_SHORT).show(); return false;
} }
@Override @Override
public void onItemLongClicked(Widget item) { public boolean onItemLongClicked(Widget item) {
Toast.makeText(this, "onItemLongClicked", Toast.LENGTH_SHORT).show(); return false;
} }
} }
...@@ -349,9 +349,13 @@ public class WidgetListFragment extends Fragment ...@@ -349,9 +349,13 @@ public class WidgetListFragment extends Fragment
} }
} }
public ArrayList<Widget> mWidgets = new ArrayList<>();
public void updateWidgets(List<Widget> widgets) { public void updateWidgets(List<Widget> widgets) {
if (mAdapter != null) { if (mAdapter != null) {
mAdapter.update(widgets, mRefreshLayout.isRefreshing()); mAdapter.update(widgets, mRefreshLayout.isRefreshing());
mWidgets.clear();
mWidgets.addAll(widgets);
mActivity.updateWidgets(mWidgets);
boolean emptyPage = widgets.size() == 0; boolean emptyPage = widgets.size() == 0;
mRecyclerView.setVisibility(emptyPage ? View.GONE : View.VISIBLE); mRecyclerView.setVisibility(emptyPage ? View.GONE : View.VISIBLE);
mEmptyPageView.setVisibility(emptyPage ? View.VISIBLE : View.GONE); mEmptyPageView.setVisibility(emptyPage ? View.VISIBLE : View.GONE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment