diff --git a/app/src/main/java/com/amine/myterio/app/DetailsActivity.java b/app/src/main/java/com/amine/myterio/app/DetailsActivity.java
index 58e6ea9..8597510 100644
--- a/app/src/main/java/com/amine/myterio/app/DetailsActivity.java
+++ b/app/src/main/java/com/amine/myterio/app/DetailsActivity.java
@@ -1,9 +1,11 @@
package com.amine.myterio.app;
+import android.app.Dialog;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.Window;
import com.melnykov.fab.FloatingActionButton;
@@ -34,7 +36,14 @@ public class DetailsActivity extends AppCompatActivity {
int id = item.getItemId();
//noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
+ if (id == R.id.action_about) {
+ final Dialog dialog = new Dialog(this);
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ dialog.setCancelable(true);
+
+ // Content of the dialog
+ dialog.setContentView(R.layout.activity_more);
+ dialog.show();
return true;
}
if (id == android.R.id.home) {
diff --git a/app/src/main/java/com/amine/myterio/app/MainActivity.java b/app/src/main/java/com/amine/myterio/app/MainActivity.java
index 45ba3cf..cdc3bfb 100644
--- a/app/src/main/java/com/amine/myterio/app/MainActivity.java
+++ b/app/src/main/java/com/amine/myterio/app/MainActivity.java
@@ -1,9 +1,14 @@
package com.amine.myterio.app;
+import android.app.Dialog;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.Window;
+import com.amine.myterio.app.config.Config;
+
+import java.util.Locale;
public class MainActivity extends AppCompatActivity {
@@ -12,6 +17,7 @@ public class MainActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
+ Config.country = Locale.getDefault().getLanguage();
}
@Override
@@ -29,7 +35,14 @@ public class MainActivity extends AppCompatActivity {
int id = item.getItemId();
//noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
+ if (id == R.id.action_about) {
+ final Dialog dialog = new Dialog(this);
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ dialog.setCancelable(true);
+
+ // Content of the dialog
+ dialog.setContentView(R.layout.activity_more);
+ dialog.show();
return true;
}
diff --git a/app/src/main/java/com/amine/myterio/app/SearchActivity.java b/app/src/main/java/com/amine/myterio/app/SearchActivity.java
index e2d6a80..cbb8fce 100644
--- a/app/src/main/java/com/amine/myterio/app/SearchActivity.java
+++ b/app/src/main/java/com/amine/myterio/app/SearchActivity.java
@@ -1,9 +1,11 @@
package com.amine.myterio.app;
+import android.app.Dialog;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.Window;
public class SearchActivity extends AppCompatActivity {
@@ -31,7 +33,14 @@ public class SearchActivity extends AppCompatActivity {
int id = item.getItemId();
//noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
+ if (id == R.id.action_about) {
+ final Dialog dialog = new Dialog(this);
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+ dialog.setCancelable(true);
+
+ // Content of the dialog
+ dialog.setContentView(R.layout.activity_more);
+ dialog.show();
return true;
}
diff --git a/app/src/main/java/com/amine/myterio/app/fragments/CitiesListFragment.java b/app/src/main/java/com/amine/myterio/app/fragments/CitiesListFragment.java
index f26447e..900218a 100644
--- a/app/src/main/java/com/amine/myterio/app/fragments/CitiesListFragment.java
+++ b/app/src/main/java/com/amine/myterio/app/fragments/CitiesListFragment.java
@@ -2,19 +2,16 @@ package com.amine.myterio.app.fragments;
import android.app.Activity;
import android.app.Fragment;
-import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
-import android.telephony.TelephonyManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.amine.myterio.app.R;
import com.amine.myterio.app.SearchActivity;
import com.amine.myterio.app.adapters.CitiesAdapter;
-import com.amine.myterio.app.config.Config;
import com.amine.myterio.app.db.CityDAO;
import com.amine.myterio.app.model.City;
import com.melnykov.fab.FloatingActionButton;
@@ -48,9 +45,7 @@ public class CitiesListFragment extends Fragment {
handleView();
}
- private void handleView() {
- saveUserCountry();
-
+ public void handleView() {
RecyclerView.LayoutManager layoutManager;
layoutManager = new LinearLayoutManager(mActivity);
@@ -75,12 +70,4 @@ public class CitiesListFragment extends Fragment {
}
});
}
-
-
- private void saveUserCountry() {
- TelephonyManager tm = (TelephonyManager) mActivity.getSystemService(Context.TELEPHONY_SERVICE);
- Config.country = tm.getSimCountryIso().toLowerCase();
- if (Config.country == null || Config.country.equals("") || Config.country.isEmpty())
- Config.country = mActivity.getResources().getConfiguration().locale.getCountry().toLowerCase();
- }
}
diff --git a/app/src/main/java/com/amine/myterio/app/fragments/DetailsFragment.java b/app/src/main/java/com/amine/myterio/app/fragments/DetailsFragment.java
index 52fbe7b..940eeaa 100644
--- a/app/src/main/java/com/amine/myterio/app/fragments/DetailsFragment.java
+++ b/app/src/main/java/com/amine/myterio/app/fragments/DetailsFragment.java
@@ -2,6 +2,7 @@ package com.amine.myterio.app.fragments;
import android.app.Activity;
import android.app.Fragment;
+import android.content.res.Configuration;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@@ -139,9 +140,32 @@ public class DetailsFragment extends Fragment {
if (isFav) {
dao.deleteCity(f[0].getCity());
fab.setImageResource(R.mipmap.ic_favorite_black_24dp);
+ if (((getActivity().getResources().getConfiguration().screenLayout &
+ Configuration.SCREENLAYOUT_SIZE_MASK) ==
+ Configuration.SCREENLAYOUT_SIZE_LARGE) || ((getActivity().getResources().getConfiguration().screenLayout &
+ Configuration.SCREENLAYOUT_SIZE_MASK) ==
+ Configuration.SCREENLAYOUT_SIZE_XLARGE) || ((getActivity().getResources().getConfiguration().screenLayout &
+ Configuration.SCREENLAYOUT_SIZE_MASK) ==
+ 4)) {
+ CitiesListFragment f = (CitiesListFragment) getFragmentManager().findFragmentByTag("cities_list_frag");
+ if (f != null)
+ f.handleView();
+ }
+
} else {
dao.insertCity(f[0].getCity());
fab.setImageResource(R.mipmap.ic_favorite_border_black_24dp);
+ if (((getActivity().getResources().getConfiguration().screenLayout &
+ Configuration.SCREENLAYOUT_SIZE_MASK) ==
+ Configuration.SCREENLAYOUT_SIZE_LARGE) || ((getActivity().getResources().getConfiguration().screenLayout &
+ Configuration.SCREENLAYOUT_SIZE_MASK) ==
+ Configuration.SCREENLAYOUT_SIZE_XLARGE) || ((getActivity().getResources().getConfiguration().screenLayout &
+ Configuration.SCREENLAYOUT_SIZE_MASK) ==
+ 4)) {
+ CitiesListFragment f = (CitiesListFragment) getFragmentManager().findFragmentByTag("cities_list_frag");
+ if (f != null)
+ f.handleView();
+ }
}
}
});
diff --git a/app/src/main/res/layout-large/activity_main.xml b/app/src/main/res/layout-large/activity_main.xml
index 8ae247a..c90e71a 100644
--- a/app/src/main/res/layout-large/activity_main.xml
+++ b/app/src/main/res/layout-large/activity_main.xml
@@ -12,6 +12,7 @@
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight=".4"
+ android:tag="cities_list_frag"
tools:layout="@layout/cities_list_fragment"/>
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_details.xml b/app/src/main/res/menu/menu_details.xml
index 9c10812..bcfdf4a 100644
--- a/app/src/main/res/menu/menu_details.xml
+++ b/app/src/main/res/menu/menu_details.xml
@@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.amine.myterio.app.DetailsActivity">
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index a459e0a..ab0022b 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -2,8 +2,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".MainActivity">
-
diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml
index 9ef21e9..679b133 100644
--- a/app/src/main/res/menu/menu_search.xml
+++ b/app/src/main/res/menu/menu_search.xml
@@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.amine.myterio.app.SearchActivity">
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index ed52454..af8124c 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -1,7 +1,7 @@
Myterio
Hello world!
- Settings
+ About
Search
Details
This location dosn\'t have any weather.
@@ -11,4 +11,5 @@
Do you want to delete this location ?
Delete the location ?
Error while getting the countires list
+ Libraries
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 900fe3b..2a92963 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
Myterio
Hello world!
- Paramètres
+ à propos
Rechercher
Détails
Pas de prévisions pour cette ville.
@@ -11,4 +11,5 @@
Supprimer
Annuler
Erreur lors de la récupération des pays
+ Librairies