diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/MainActivity.java b/mobile/src/main/java/org/openhab/habdroid/ui/MainActivity.java index 81fadbceecb64323c794eff7e97846cab2ef2c05..856d67b33f202e370d011f64ab9880b8afbda3d7 100644 --- a/mobile/src/main/java/org/openhab/habdroid/ui/MainActivity.java +++ b/mobile/src/main/java/org/openhab/habdroid/ui/MainActivity.java @@ -9,6 +9,7 @@ package org.openhab.habdroid.ui; +import android.annotation.SuppressLint; import android.app.AlertDialog; import android.app.Dialog; import android.app.PendingIntent; @@ -98,6 +99,7 @@ import org.openhab.habdroid.util.Util; import java.lang.reflect.Constructor; import java.nio.charset.Charset; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Locale; @@ -454,6 +456,7 @@ public class MainActivity extends AbstractBaseActivity implements } } + @SuppressLint("StringFormatInvalid") @Override public void onAvailableConnectionChanged() { Log.d(TAG, "onAvailableConnectionChanged()"); @@ -783,7 +786,7 @@ public class MainActivity extends AbstractBaseActivity implements recognitionsIntent.putExtra("serverProperties", mServerProperties); recognitionsIntent.putParcelableArrayListExtra("widgets", mWidgets); startActivityForResult(recognitionsIntent, INFO_REQUEST_CODE); - Util.overridePendingTransition(this, false); + //Util.overridePendingTransition(this, false); } private Sitemap selectConfiguredSitemapFromList() { diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/RecognitionsActivity.java b/mobile/src/main/java/org/openhab/habdroid/ui/RecognitionsActivity.java index 8f039c62c42d224dc7c7133e4ee1aaed29d20556..1a7cad5ebaf979e770185d7c5e1f727d15c4fc4a 100644 --- a/mobile/src/main/java/org/openhab/habdroid/ui/RecognitionsActivity.java +++ b/mobile/src/main/java/org/openhab/habdroid/ui/RecognitionsActivity.java @@ -56,7 +56,7 @@ public class RecognitionsActivity extends AppCompatActivity implements WidgetAda @Override public void onCreate(Bundle savedInstanceState) { - Util.setActivityTheme(this); + //Util.setActivityTheme(this); super.onCreate(savedInstanceState); setContentView(R.layout.activity_recognitions); @@ -179,7 +179,7 @@ public class RecognitionsActivity extends AppCompatActivity implements WidgetAda @Override public void finish() { super.finish(); - Util.overridePendingTransition(this, true); + //Util.overridePendingTransition(this, true); } private void updateTitle() { @@ -192,12 +192,12 @@ public class RecognitionsActivity extends AppCompatActivity implements WidgetAda } @Override - public void onItemClicked(Widget item) { - Toast.makeText(this, "onItemClicked", Toast.LENGTH_SHORT).show(); + public boolean onItemClicked(Widget item) { + return false; } @Override - public void onItemLongClicked(Widget item) { - Toast.makeText(this, "onItemLongClicked", Toast.LENGTH_SHORT).show(); + public boolean onItemLongClicked(Widget item) { + return false; } } diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/WidgetListFragment.java b/mobile/src/main/java/org/openhab/habdroid/ui/WidgetListFragment.java index fc3a3da3e2062e1311372f13a29ac8da77a9783f..17de0234425e612d77cf7315f855e0f8c9cdadce 100644 --- a/mobile/src/main/java/org/openhab/habdroid/ui/WidgetListFragment.java +++ b/mobile/src/main/java/org/openhab/habdroid/ui/WidgetListFragment.java @@ -349,9 +349,13 @@ public class WidgetListFragment extends Fragment } } + public ArrayList<Widget> mWidgets = new ArrayList<>(); public void updateWidgets(List<Widget> widgets) { if (mAdapter != null) { mAdapter.update(widgets, mRefreshLayout.isRefreshing()); + mWidgets.clear(); + mWidgets.addAll(widgets); + mActivity.updateWidgets(mWidgets); boolean emptyPage = widgets.size() == 0; mRecyclerView.setVisibility(emptyPage ? View.GONE : View.VISIBLE); mEmptyPageView.setVisibility(emptyPage ? View.VISIBLE : View.GONE);