Skip to content

Commit 12905c8

Browse files
MikhailMarchMikhailMarch
committed
commit
1 parent 2e7fe19 commit 12905c8

File tree

14 files changed

+627
-70
lines changed

14 files changed

+627
-70
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
99

1010
<application
11-
android:networkSecurityConfig="@xml/network_security_config"
12-
android:usesCleartextTraffic="true"
1311
android:allowBackup="true"
1412
android:icon="@mipmap/ic_launcher"
1513
android:label="@string/app_name"
14+
android:networkSecurityConfig="@xml/network_security_config"
1615
android:roundIcon="@mipmap/ic_launcher_round"
1716
android:supportsRtl="true"
18-
android:theme="@style/AppTheme">
17+
android:theme="@style/AppTheme"
18+
android:usesCleartextTraffic="true">
19+
<activity android:name=".PlacesActivity"></activity>
1920

2021
<uses-library
2122
android:name="org.apache.http.legacy"
@@ -36,7 +37,8 @@
3637
</intent-filter>
3738
</activity>
3839
<activity android:name=".MapActivity" />
39-
<activity android:name=".EventsActivity"/>
40+
<activity android:name=".EventsActivity" />
41+
<activity android:name=".PlacesActivity" />
4042
</application>
4143

4244
</manifest>

‎app/src/main/java/com/example/webapplicationwithspring/Events/Place.java‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
package com.example.webapplicationwithspring.Events;
2+
3+
public class Place {
4+
private String location;
5+
private String name;
6+
private String description;
7+
private String workHours;
8+
private String address;
9+
private String telegram;
10+
private String phoneNumber;
11+
private int id;
12+
13+
public Place(String name, String location, String description, String workHours,String address, String telegram, String phoneNumber, int id) {
14+
this.location = location;
15+
this.name = name;
16+
this.description = description;
17+
this.workHours = workHours;
18+
this.address = address;
19+
this.telegram = telegram;
20+
this.phoneNumber = phoneNumber;
21+
this.id = id;
22+
23+
}
24+
25+
public String getLocation() {
26+
return location;
27+
}
28+
29+
public void setLocation(String location) {
30+
this.location = location;
31+
}
32+
33+
public String getName() {
34+
return name;
35+
}
36+
37+
public void setName(String name) {
38+
this.name = name;
39+
}
40+
41+
public String getDescription() {
42+
return description;
43+
}
44+
45+
public void setDescription(String description) {
46+
this.description = description;
47+
}
48+
49+
public String getWorkHours() {
50+
return workHours;
51+
}
52+
53+
public void setWorkHours(String workHours) {
54+
this.workHours = workHours;
55+
}
56+
57+
public String getAddress() {
58+
return address;
59+
}
60+
61+
public void setAddress(String adress) {
62+
this.address = adress;
63+
}
64+
65+
public String getTelegram() {
66+
return telegram;
67+
}
68+
69+
public void setTelegram(String telegram) {
70+
this.telegram = telegram;
71+
}
72+
73+
public String getPhoneNumber() {
74+
return phoneNumber;
75+
}
76+
77+
public void setPhoneNumber(String phoneNumber) {
78+
this.phoneNumber = phoneNumber;
79+
}
80+
}

‎app/src/main/java/com/example/webapplicationwithspring/Events/PlacesController.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.example.webapplicationwithspring.Events;
2+
3+
import java.util.Collection;
4+
import java.util.HashMap;
5+
import java.util.Map;
6+
7+
public class PlacesController {
8+
public static Map<Integer, Place> placesMap = new HashMap<Integer, Place>();
9+
public static void addEvent(String name, String location, String description, String workHours,String address, String telegram, String phoneNumbe, int id){
10+
placesMap.put(id, new Place(name, location,description,workHours,address,telegram,phoneNumbe,id));
11+
}
12+
public static Place getPlace(int index){
13+
return placesMap.get(index);
14+
}
15+
public static Collection<Place> getValue(){
16+
return placesMap.values();
17+
}
18+
public static int getSize(){ return placesMap.size(); }
19+
20+
}

‎app/src/main/java/com/example/webapplicationwithspring/EventsActivity.java‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import android.view.ViewGroup;
1313
import android.widget.AdapterView;
1414
import android.widget.ArrayAdapter;
15+
import android.widget.FrameLayout;
16+
import android.widget.LinearLayout;
1517
import android.widget.ListView;
1618
import android.widget.TextView;
1719
import android.widget.Toast;
@@ -47,8 +49,9 @@ public class EventsActivity extends AppCompatActivity {
4749
MyAdapter adapter;
4850
FragmentManager fragmentManager = getFragmentManager();
4951
// url for local server
50-
private String url = "http://192.168.0.119:8080/eventsList";
51-
// this will switch between items in the navigation bar
52+
//private String url = "http://192.168.0.119:8080/eventsList";
53+
private String url = "http://172.20.10.12:8080/eventsList";
54+
// this will switch between items in the navigation bar;
5255
private BottomNavigationView.OnNavigationItemSelectedListener navListener =
5356
new BottomNavigationView.OnNavigationItemSelectedListener() {
5457
@Override
@@ -102,8 +105,8 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
102105
String[] titles = new String[EventsController.getSize()];
103106
String[] descriptions = new String[EventsController.getSize()];
104107
for (Event e : EventsController.getValue()) {
105-
titles[e.getId() - 1] = e.getEventName();
106-
descriptions[e.getId() - 1] = e.getEventDescription();
108+
titles[e.getId()] = e.getEventName();
109+
descriptions[e.getId()] = e.getEventDescription();
107110
}
108111
MyAdapter adapter = new MyAdapter(this, titles, descriptions);
109112
listView.setAdapter(adapter);
@@ -134,16 +137,19 @@ public void onResponse(JSONArray response) {
134137
adapter = new MyAdapter(EventsActivity.this, titles.toArray(new String[titles.size()]), descriptions.toArray(new String[descriptions.size()]));
135138
listView.setAdapter(adapter);
136139
} catch (JSONException e) {
140+
//View errorView = getTextView(EventsActivity.this, "Server does not response");
141+
142+
//listView.addHeaderView(errorView);
137143
e.printStackTrace();
138144
}
139145
}
140146
},
141147
new Response.ErrorListener() {
142148
@Override
143149
public void onErrorResponse(VolleyError error) {
144-
//TextView tv = getTextView(EventsActivity.this, "Server does not response");
145-
146-
//linearLayout.addView(tv);
150+
TextView tv = getTextView(EventsActivity.this, "Server does not response");
151+
FrameLayout frameLayout = findViewById(R.id.fragment_container);
152+
frameLayout.addView(tv);
147153
Log.d("EventSSS", error.toString());
148154
}
149155
}
@@ -171,7 +177,7 @@ public void handleOnBackPressed() {
171177
nView.setOnNavigationItemSelectedListener(navListener);
172178
nView.setSelectedItemId(R.id.nav_events);
173179
}
174-
/*
180+
175181
public TextView getTextView(Context context, String text) {
176182
final TextView tv = new TextView(context);
177183
tv.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
@@ -188,9 +194,9 @@ public void onClick(View v) {
188194
return tv;
189195

190196
}
191-
*/
192197

193-
// when the idem is clicked details have to be shown
198+
199+
// when the idem is clicked details have to be shown
194200
private void showDetails(int index) {
195201
listView.setItemChecked(index, true);
196202
EventFragment eventFragment = EventFragment.newInstance(index);
@@ -200,7 +206,7 @@ private void showDetails(int index) {
200206
fragmentTransaction.commit();
201207
listView.setVisibility(View.INVISIBLE);
202208
}
203-
// customized array adapter is needed for proper data visualization
209+
// customized array adapter is needed for proper data visualization
204210
class MyAdapter extends ArrayAdapter<String> {
205211
Context context;
206212
String rTitle[];

‎app/src/main/java/com/example/webapplicationwithspring/MainActivity.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.util.Log;
77
import android.view.View;
88
import android.widget.Button;
9+
import android.widget.EditText;
910
import android.widget.Toast;
1011

1112
import androidx.appcompat.app.AppCompatActivity;
@@ -16,6 +17,9 @@
1617

1718
public class MainActivity extends AppCompatActivity {
1819

20+
private EditText emailEditText = findViewById(R.id.login_Email);
21+
private EditText passwordEditText = findViewById(R.id.login_Password);
22+
1923
GoogleMap map;
2024
private static final String TAG = "MainActivity";
2125
private static final int ERROR = 9001;
@@ -24,9 +28,6 @@ protected void onCreate(Bundle savedInstanceState) {
2428
super.onCreate(savedInstanceState);
2529
setContentView(R.layout.activity_main);
2630

27-
28-
29-
3031
if(isServicesOK()){
3132
init();
3233
}
@@ -37,6 +38,9 @@ private void init(){
3738
buttonMap.setOnClickListener(new View.OnClickListener() {
3839
@Override
3940
public void onClick(View v) {
41+
String email = emailEditText.getText().toString();
42+
String password = passwordEditText.getText().toString();
43+
4044
Intent intent = new Intent(MainActivity.this, MapActivity.class);
4145
startActivity(intent);
4246
}

0 commit comments

Comments
 (0)