Skip to content

Commit b920c49

Browse files
committed
-prima di uscire si passa sempre dalla home #36
1 parent b84eaf0 commit b920c49

File tree

4 files changed

+29
-16
lines changed

4 files changed

+29
-16
lines changed

res/values/string.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<resources>
33

44
<string name="app_name">Gaia Mobile</string>
5-
<string name="app_version">0.6.14</string>
5+
<string name="app_version">0.6.15</string>
66
<string name="menu_settings">Settings</string>
77
<string name="caricamento">Caricamento in corso</string>
88
<string name="menu_comunicazioni">Ultime 20 Comunicazioni:</string>

src/it/gaiacri/mobile/ElencoAttivita.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
import it.gaiacri.mobile.Utils.DateUtils;
55
import it.gaiacri.mobile.Utils.ErrorJson;
66

7-
import java.text.ParseException;
8-
import java.text.SimpleDateFormat;
97
import java.util.ArrayList;
108
import java.util.Calendar;
11-
import java.util.Date;
129
import java.util.HashMap;
1310

1411
import org.json.JSONArray;
@@ -36,7 +33,6 @@
3633
import android.widget.ListView;
3734
import android.widget.SimpleAdapter;
3835
import android.widget.TextView;
39-
import android.widget.Toast;
4036
import android.widget.AdapterView.OnItemClickListener;
4137

4238
public class ElencoAttivita extends Fragment {

src/it/gaiacri/mobile/MainActivity.java

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected void onCreate(Bundle savedInstanceState) {
7070
t.setArguments(b);
7171
FragmentManager fragmentManager = getSupportFragmentManager();
7272
fragmentManager.beginTransaction()
73-
.replace(R.id.content_frame, t).commit();
73+
.replace(R.id.content_frame, t,"main").commit();
7474
title=getString(R.string.title_activity_menu_principale);
7575
}
7676

@@ -191,6 +191,7 @@ private class DrawerItemClickListener implements ListView.OnItemClickListener {
191191
public void onItemClick(AdapterView<?> parent, View view, int position,
192192
long id) {
193193
Fragment test=null;
194+
String tag="";
194195
mDrawerList.setItemChecked(position, true);
195196
Bundle b=new Bundle();
196197
b.putString("sid", "test");
@@ -199,6 +200,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position,
199200
title=getString(R.string.ns_menu_home_page);
200201
test = new MenuPrincipale();
201202
test.setArguments(b);
203+
tag="main";
202204
}
203205
//Rubrica Delegati
204206
if(((TextView)view.findViewById(R.id.menurow_title)).getText().toString().equals(getString(R.string.ns_menu_rubrica_delegati))){
@@ -248,17 +250,12 @@ public void onItemClick(AdapterView<?> parent, View view, int position,
248250
startActivity(Intent.createChooser(emailIntent, "Send email..."));
249251
}
250252

251-
252-
253-
254-
255253
if (test != null) {
256254
FragmentManager fragmentManager = getSupportFragmentManager();
257255
fragmentManager.beginTransaction()
258-
.replace(R.id.content_frame, test).commit(); //
256+
.replace(R.id.content_frame, test,tag).commit(); //
259257

260258
}
261-
262259
//You should reset item counter
263260
mDrawer.closeDrawer(mDrawerList);
264261

@@ -316,4 +313,22 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
316313
}
317314
}
318315

316+
@Override
317+
public void onBackPressed() {
318+
FragmentManager fragmentManager = getSupportFragmentManager();
319+
if(fragmentManager.findFragmentById(R.id.content_frame).getTag()!= "main"){
320+
title=getString(R.string.ns_menu_home_page);
321+
Fragment test = new MenuPrincipale();
322+
Bundle b=new Bundle();
323+
b.putString("sid", "prova");
324+
test.setArguments(b);
325+
fragmentManager.beginTransaction()
326+
.replace(R.id.content_frame, test,"main").commit(); //
327+
}else{
328+
super.onBackPressed();
329+
}
330+
}
331+
332+
333+
319334
}

src/it/gaiacri/mobile/MenuPrincipale.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import java.util.HashMap;
77

8-
import org.json.JSONArray;
98
import org.json.JSONException;
109

1110
import android.os.Bundle;
@@ -245,9 +244,12 @@ public void onClick(DialogInterface dialog, int id) {
245244

246245
//potrebbe dare problemi...sicuramente dara problemi :P
247246
public void AddPosta(){
248-
FragmentManager fragmentManager = this.getActivity().getSupportFragmentManager();
249-
fragmentManager.beginTransaction()
250-
.replace(R.id.posta_frame, new PostaIngresso()).commit(); //
247+
FragmentActivity activity=this.getActivity();
248+
if(activity!= null){
249+
FragmentManager fragmentManager = activity.getSupportFragmentManager();
250+
fragmentManager.beginTransaction()
251+
.replace(R.id.posta_frame, new PostaIngresso()).commit(); //
252+
}
251253
}
252254

253255
}

0 commit comments

Comments
 (0)