From c7057b6078bf2a489e470f8aa7bd67ca332a733f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20F=C3=B6rster?= Date: Wed, 11 Jan 2017 20:46:43 +0100 Subject: [PATCH] undo some changes. no rotation possible anymore --- .../paulforster/nxtapp/MainActivity.java | 10 ++++++++++ .../paulforster/nxtapp/MapFragment.java | 6 ++++-- NXTApp/nXT/build/libs/nXT.jar | Bin 54824 -> 54824 bytes 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/NXTApp/app/src/main/java/com/example/paulforster/nxtapp/MainActivity.java b/NXTApp/app/src/main/java/com/example/paulforster/nxtapp/MainActivity.java index e64581d..3ec5953 100644 --- a/NXTApp/app/src/main/java/com/example/paulforster/nxtapp/MainActivity.java +++ b/NXTApp/app/src/main/java/com/example/paulforster/nxtapp/MainActivity.java @@ -76,6 +76,15 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) { } }); getSupportFragmentManager().enableDebugLogging(true); + btDialog = new BluetoothDialogFragment(); + MapFragment mapFragment = new MapFragment(); + ParkFragment parkFragment = new ParkFragment(); + FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); + ft.add(R.id.content, mapFragment, "MAPFRAGMENT"); + ft.add(R.id.content, parkFragment, "PARKFRAGMENT"); + ft.hide(parkFragment); + ft.commit(); + /** if (savedInstanceState == null) { btDialog = new BluetoothDialogFragment(); MapFragment mapFragment = new MapFragment(); @@ -90,6 +99,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) { MapFragment mapFragment = (MapFragment) getSupportFragmentManager().findFragmentByTag("MAPFRAGMENT"); ParkFragment parkFragment = (ParkFragment) getSupportFragmentManager().findFragmentByTag("PARKFRAGMENT"); } + */ } @Override diff --git a/NXTApp/app/src/main/java/com/example/paulforster/nxtapp/MapFragment.java b/NXTApp/app/src/main/java/com/example/paulforster/nxtapp/MapFragment.java index 48da2b9..c495033 100644 --- a/NXTApp/app/src/main/java/com/example/paulforster/nxtapp/MapFragment.java +++ b/NXTApp/app/src/main/java/com/example/paulforster/nxtapp/MapFragment.java @@ -51,8 +51,8 @@ public class MapFragment extends Fragment { //Parkingslot-Kram private int noStoredSlots = 0; private int noSlots = 0; - ArrayList parkingslotArrayList; - ArrayList imageviewArrayList; + ArrayList parkingslotArrayList = new ArrayList<>(); + ArrayList imageviewArrayList = new ArrayList<>(); Handler mHandler = null; @@ -60,6 +60,7 @@ public class MapFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.map_fragment, container, false); + /** if (savedInstanceState != null) { // Restore last state parkingslotArrayList = savedInstanceState.getParcelableArrayList("parkingslotArrayList"); @@ -67,6 +68,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, } else { parkingslotArrayList = new ArrayList<>(); } + */ tileView = new TileView(this.getActivity()); tileView.setSize(1024, 512); tileView.defineBounds(-30,90,210,-30); diff --git a/NXTApp/nXT/build/libs/nXT.jar b/NXTApp/nXT/build/libs/nXT.jar index 7b61b1c6807fdd49186cd28086ced04a23340b6c..fe0144c1ae136ee3e1005d98eb5e441ad68cec60 100644 GIT binary patch delta 639 zcmXBP%S#(k6bA5{nL%w#RCH0Ih%M5Bq%IUu;=;OWF)9X=21QLv#YEIDgwW9XSajpI zI%;rJNJR<6B08q^5vzlOm`olsN&WySh#*=-x-FgWbaQ`vXYM_7PI!Y4Z}28ZCodQo zD=K2X(7egd>E|aa&do;78`}Cc!0AZse54lMJiRxRctcjZL$2vQ78r{e=YLm% zqD~cX<+A<>56um8gz}U|IWTiWeZ0YI%FdNHX0uNp?Rej_6EQIMU7QS7EvQEEwQ7>?)}sbY6%J=; znvW5Ya_P54%4?fnDR*q`aW_O&)Dn(QC_cD*e#aoceZJPiys5@!?wLsT0n>u z&{NZ4EwySmIv{W59`gC=HTmq!iu+>!c>rkVHeimo>vM@c@m{bRcYr@}C$J}|_$A>% z`kNR8g9@>)3?W&P4s;n$x`3SQ0;Q=}!26%Wln1FgJp`uH-5`;6f=8KN;Lo^$lA+>b z)s5C4R2m|szC?PcQJT;wMYT~BYqE4RkhSCaNwyP|Oi%KOBi`X%(k60ZP#ANcAN%9AXPy|sC>9%yfiM0{Tp6&r+){b_p`NjrVezI^Sda_F zk{60z>l6Rjt9WRtnI~83Bo4XfrGxUav)+O%d#DtP_%FT;4$LtS1(=Iuyafw z(8nH7t8w2-qiPQJ$ZM&CY&^ast50k=FZ7%SfqLoyrg)P!ROpCzg4MVi{Ed6C=Sp;f zF9|>Rm*@k1GO;W7BUzGeFqZTJDftQ%rMkfIJ^LwYf10L->2y2x5^1`jB11P!W_&2h z87e+ge0anM#RF1G3wWYZ8doVr)e#iSvve|;b)o$z+Xjkr&DiVC4S|DPH?ZUf!ED|O Ha(VB6j@Rhe