From: Gustavo Martin Morcuende <gu.martinm@gmail.com>
Date: Wed, 31 Aug 2016 21:44:02 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/gumartinm/AndroidWeatherInformation
X-Git-Tag: weatherinformation-1.3~8
X-Git-Url: https://git.gumartinm.name/?a=commitdiff_plain;h=69adae3585254a5e84de94c41249b5a28cf500a5;p=AndroidWeatherInformation

Merge branch 'master' of https://github.com/gumartinm/AndroidWeatherInformation
---

69adae3585254a5e84de94c41249b5a28cf500a5
diff --cc app/src/main/java/name/gumartinm/weather/information/fragment/specific/SpecificFragment.java
index 09bbf42,09bbf42..f69e8e2
--- a/app/src/main/java/name/gumartinm/weather/information/fragment/specific/SpecificFragment.java
+++ b/app/src/main/java/name/gumartinm/weather/information/fragment/specific/SpecificFragment.java
@@@ -26,6 -26,6 +26,7 @@@ import android.graphics.Bitmap
  import android.graphics.BitmapFactory;
  import android.os.Bundle;
  import android.support.v4.app.Fragment;
++import android.support.v7.app.AppCompatActivity;
  import android.view.LayoutInflater;
  import android.view.View;
  import android.view.ViewGroup;
@@@ -225,7 -225,7 +226,8 @@@ public class SpecificFragment extends F
  
  
          // 4. Update UI.
--        this.getActivity().getActionBar().setSubtitle(dayFormatter.format(date).toUpperCase());
++        final AppCompatActivity appCompatActivity = (AppCompatActivity)this.getActivity();
++        appCompatActivity.getSupportActionBar().setSubtitle(dayFormatter.format(date).toUpperCase());
          
          final TextView tempMaxView = (TextView) getActivity().findViewById(R.id.weather_specific_temp_max);
          tempMaxView.setText(tempMax);
diff --cc app/src/main/java/name/gumartinm/weather/information/widget/WidgetConfigure.java
index 58999e8,58999e8..ec8898e
--- a/app/src/main/java/name/gumartinm/weather/information/widget/WidgetConfigure.java
+++ b/app/src/main/java/name/gumartinm/weather/information/widget/WidgetConfigure.java
@@@ -15,13 -15,13 +15,13 @@@
   */
  package name.gumartinm.weather.information.widget;
  
--import android.app.ActionBar;
--import android.app.Activity;
  import android.appwidget.AppWidgetManager;
  import android.content.Context;
  import android.content.Intent;
  import android.content.SharedPreferences;
  import android.os.Bundle;
++import android.support.v7.app.ActionBar;
++import android.support.v7.app.AppCompatActivity;
  import android.view.View;
  import android.widget.CompoundButton;
  import android.widget.Spinner;
@@@ -29,7 -29,7 +29,7 @@@ import android.widget.Switch
  
  import name.gumartinm.weather.information.R;
  
--public class WidgetConfigure extends Activity {
++public class WidgetConfigure extends AppCompatActivity {
      private static final String WIDGET_PREFERENCES_NAME = "WIDGET_PREFERENCES";
  	private int mAppWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
  
@@@ -85,9 -85,9 +85,11 @@@
              }
          });
          if (isShowCountry) {
++            // TODO: We must use CheckBox for API 11 -->
              countrySwitch.setChecked(true);
              countrySwitch.setText(this.getString(R.string.widget_preferences_country_switch_on_summary));
          } else {
++            // TODO: We must use CheckBox for API 11 -->
              countrySwitch.setChecked(false);
              countrySwitch.setText(this.getString(R.string.widget_preferences_country_switch_off_summary));
          }
@@@ -121,7 -121,7 +123,7 @@@
      public void onResume() {
          super.onResume();
  
--        final ActionBar actionBar = this.getActionBar();
++        final ActionBar actionBar = this.getSupportActionBar();
          actionBar.setTitle(this.getString(R.string.widget_preferences_action_settings));
      }