mirror
/
MeteoSystem
kopia lustrzana https://github.com/SP8EBC/MeteoSystem
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

data export sketch

fix/get-all-stations-hangout
Mateusz Lubecki 2021-10-13 21:00:10 +02:00
rodzic 2f1652a9fb
commit 32ada27816
16 zmienionych plików z 244 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
.idea/compiler.xml
Wyświetl plik

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="1.8" />
<bytecodeTargetLevel target="11" />
</component>
</project>

17
.idea/deploymentTargetDropDown.xml 100644
Wyświetl plik

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<targetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="$USER_HOME$/.android/avd/Pixel_4_XL_API_28.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2021-08-22T19:33:57.901403Z" />
</component>
</project>

3
.idea/gradle.xml
Wyświetl plik

@ -4,7 +4,7 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="PLATFORM" />
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="1.8" />
@ -15,7 +15,6 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
</component>

18
.idea/misc.xml
Wyświetl plik

@ -1,6 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="app/src/main/res/layout/activity_all_stations.xml" value="0.3651041666666667" />
<entry key="app/src/main/res/layout/activity_all_stations_linear_layout.xml" value="0.3651041666666667" />
<entry key="app/src/main/res/layout/activity_export_data.xml" value="0.33" />
<entry key="app/src/main/res/layout/activity_favourites.xml" value="0.3651041666666667" />
<entry key="app/src/main/res/layout/activity_favourites_empty.xml" value="0.3651041666666667" />
<entry key="app/src/main/res/layout/activity_favourites_linear_layout.xml" value="0.3651041666666667" />
<entry key="app/src/main/res/layout/activity_main.xml" value="0.3651041666666667" />
<entry key="app/src/main/res/layout/activity_station_details.xml" value="0.3651041666666667" />
<entry key="app/src/main/res/layout/activity_station_details_plots.xml" value="0.3651041666666667" />
<entry key="app/src/main/res/layout/activity_station_details_summary.xml" value="0.3651041666666667" />
</map>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

7
app/src/main/AndroidManifest.xml
Wyświetl plik

@ -11,9 +11,12 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Pogodacc">
<activity
android:name=".activity.ExportDataActivity"
android:exported="true" />
<activity
android:name=".activity.TrendActivity"
android:label="@string/title_activity_trend"></activity>
android:label="@string/title_activity_trend" />
<activity android:name=".activity.StationDetailsWindRoseActivity" />
<activity android:name=".activity.StationDetailsPlotsWind" />
<activity android:name=".activity.StationDetailsPlotsDirection" />
@ -21,7 +24,7 @@
<activity android:name=".activity.StationDetailsSummaryActivity" />
<activity android:name=".activity.StationDetailsActivity" />
<activity android:name=".activity.AllStationsActivity" />
<activity android:name=".activity.FavouritesActivity"/>
<activity android:name=".activity.FavouritesActivity" />
<activity android:name=".activity.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

2
app/src/main/java/cc/pogoda/mobile/pogodacc/activity/AllStationsActivity.java
Wyświetl plik

@ -37,7 +37,7 @@ public class AllStationsActivity extends AppCompatActivity {
WeatherStationRecyclerViewAdapter adapter = null;
adapter = new WeatherStationRecyclerViewAdapter(allStationsList.getList(), this);
adapter = new WeatherStationRecyclerViewAdapter(allStationsList.getList(), this, null);
recyclerViewAllStations.setAdapter(adapter);

28
app/src/main/java/cc/pogoda/mobile/pogodacc/activity/ExportDataActivity.java 100644
Wyświetl plik

@ -0,0 +1,28 @@
package cc.pogoda.mobile.pogodacc.activity;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.widget.ArrayAdapter;
import android.widget.Spinner;
import cc.pogoda.mobile.pogodacc.R;
public class ExportDataActivity extends AppCompatActivity {
Spinner formatSpinner;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_export_data);
formatSpinner = findViewById(R.id.spinnerOutputFormat);
ArrayAdapter adapter = ArrayAdapter.createFromResource(this, R.array.export_formats, android.R.layout.simple_spinner_item);
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
formatSpinner.setAdapter(adapter);
}
}

5
app/src/main/java/cc/pogoda/mobile/pogodacc/activity/FavouritesActivity.java
Wyświetl plik

@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
import cc.pogoda.mobile.pogodacc.R;
import cc.pogoda.mobile.pogodacc.adapter.WeatherStationRecyclerViewAdapter;
import cc.pogoda.mobile.pogodacc.config.AppConfiguration;
import cc.pogoda.mobile.pogodacc.type.ParceableFavsCallReason;
import cc.pogoda.mobile.pogodacc.type.ParceableStationsList;
public class FavouritesActivity extends AppCompatActivity {
@ -33,6 +34,8 @@ public class FavouritesActivity extends AppCompatActivity {
favourites = getIntent().getParcelableExtra("favs");
ParceableFavsCallReason callReason = getIntent().getParcelableExtra("callReason");
if (favourites == null || favourites.getList().size() == 0) {
setContentView(R.layout.activity_favourites_empty);
}
@ -44,7 +47,7 @@ public class FavouritesActivity extends AppCompatActivity {
if (recyclerViewFavourites != null) {
WeatherStationRecyclerViewAdapter adapter = null;
adapter = new WeatherStationRecyclerViewAdapter(favourites.getList(), this);
adapter = new WeatherStationRecyclerViewAdapter(favourites.getList(), this, callReason.getReason());
recyclerViewFavourites.setAdapter(adapter);

9
app/src/main/java/cc/pogoda/mobile/pogodacc/activity/MainActivity.java
Wyświetl plik

@ -22,6 +22,7 @@ import java.util.Locale;
import cc.pogoda.mobile.pogodacc.R;
import cc.pogoda.mobile.pogodacc.activity.handler.MainActImageButtonAllStationsClickEvent;
import cc.pogoda.mobile.pogodacc.activity.handler.MainActImageButtonExportClickEvent;
import cc.pogoda.mobile.pogodacc.activity.handler.MainActImageButtonFavouritesClickEvent;
import cc.pogoda.mobile.pogodacc.dao.AllStationsDao;
import cc.pogoda.mobile.pogodacc.file.FavouritiesFile;
@ -50,6 +51,8 @@ public class MainActivity extends AppCompatActivity {
private ImageButton imageButtonFavourites;
private ImageButton exportButton;
public MainActivity() {
}
@ -162,6 +165,12 @@ public class MainActivity extends AppCompatActivity {
imageButtonFavourites = (ImageButton)findViewById(R.id.imageButtonFavourites);
// set an action for clicking on export data button
exportButton = (ImageButton)findViewById(R.id.imageButtonExport);
if (exportButton != null) {
exportButton.setOnClickListener(new MainActImageButtonExportClickEvent(this));
}
// recreate list of favorites
recreateListOfFavs();
}

17
app/src/main/java/cc/pogoda/mobile/pogodacc/activity/handler/AllStationsActRecyclerViewButtonClickEvent.java
Wyświetl plik

@ -6,6 +6,7 @@ import android.view.View;
import androidx.appcompat.app.AppCompatActivity;
import cc.pogoda.mobile.pogodacc.activity.StationDetailsActivity;
import cc.pogoda.mobile.pogodacc.type.ParceableFavsCallReason;
import cc.pogoda.mobile.pogodacc.type.WeatherStation;
public class AllStationsActRecyclerViewButtonClickEvent implements View.OnClickListener {
@ -16,19 +17,23 @@ public class AllStationsActRecyclerViewButtonClickEvent implements View.OnClickL
Intent intent;
public AllStationsActRecyclerViewButtonClickEvent(WeatherStation wx, AppCompatActivity parent) {
ParceableFavsCallReason.Reason reason;
public AllStationsActRecyclerViewButtonClickEvent(WeatherStation wx, AppCompatActivity parent, ParceableFavsCallReason.Reason r) {
station = wx;
p = parent;
reason = r;
}
@Override
public void onClick(View v) {
intent = new Intent(p, StationDetailsActivity.class);
intent.putExtra("station", station);
if (reason == null || reason == ParceableFavsCallReason.Reason.FAVOURITES) {
intent = new Intent(p, StationDetailsActivity.class);
intent.putExtra("station", station);
p.startActivity(intent);
p.startActivity(intent);
return;
return;
}
}
}

28
app/src/main/java/cc/pogoda/mobile/pogodacc/activity/handler/MainActImageButtonExportClickEvent.java 100644
Wyświetl plik

@ -0,0 +1,28 @@
package cc.pogoda.mobile.pogodacc.activity.handler;
import android.content.Intent;
import android.view.View;
import androidx.appcompat.app.AppCompatActivity;
import cc.pogoda.mobile.pogodacc.activity.AllStationsActivity;
import cc.pogoda.mobile.pogodacc.activity.ExportDataActivity;
public class MainActImageButtonExportClickEvent implements View.OnClickListener{
AppCompatActivity parent;
Intent intent;
public MainActImageButtonExportClickEvent(AppCompatActivity p) {
parent = p;
intent = new Intent(this.parent, ExportDataActivity.class);
}
@Override
public void onClick(View view) {
parent.startActivity(intent);
}
}

4
app/src/main/java/cc/pogoda/mobile/pogodacc/activity/handler/MainActImageButtonFavouritesClickEvent.java
Wyświetl plik

@ -6,6 +6,7 @@ import android.view.View;
import androidx.appcompat.app.AppCompatActivity;
import cc.pogoda.mobile.pogodacc.activity.FavouritesActivity;
import cc.pogoda.mobile.pogodacc.type.ParceableFavsCallReason;
import cc.pogoda.mobile.pogodacc.type.ParceableStationsList;
public class MainActImageButtonFavouritesClickEvent implements View.OnClickListener{
@ -19,6 +20,9 @@ public class MainActImageButtonFavouritesClickEvent implements View.OnClickListe
intent = new Intent(this.parent, FavouritesActivity.class);
intent.putExtra("favs", favs);
ParceableFavsCallReason callReason = new ParceableFavsCallReason(ParceableFavsCallReason.Reason.FAVOURITES);
intent.putExtra("callReason", callReason);
}
@Override

8
app/src/main/java/cc/pogoda/mobile/pogodacc/adapter/WeatherStationRecyclerViewAdapter.java
Wyświetl plik

@ -16,6 +16,7 @@ import java.util.List;
import cc.pogoda.mobile.pogodacc.R;
import cc.pogoda.mobile.pogodacc.activity.handler.AllStationsActRecyclerViewButtonClickEvent;
import cc.pogoda.mobile.pogodacc.activity.view.AllStationsActRecyclerViewHolder;
import cc.pogoda.mobile.pogodacc.type.ParceableFavsCallReason;
import cc.pogoda.mobile.pogodacc.type.WeatherStation;
public class WeatherStationRecyclerViewAdapter extends RecyclerView.Adapter<AllStationsActRecyclerViewHolder> {
@ -24,9 +25,12 @@ public class WeatherStationRecyclerViewAdapter extends RecyclerView.Adapter<AllS
AppCompatActivity activity;
public WeatherStationRecyclerViewAdapter(List<WeatherStation> stations, AppCompatActivity parentActivity) {
ParceableFavsCallReason.Reason reason;
public WeatherStationRecyclerViewAdapter(List<WeatherStation> stations, AppCompatActivity parentActivity, ParceableFavsCallReason.Reason callReason) {
this.stations = stations;
this.activity = parentActivity;
this.reason = callReason;
}
@NonNull
@ -54,7 +58,7 @@ public class WeatherStationRecyclerViewAdapter extends RecyclerView.Adapter<AllS
textView.setText(station.getDisplayedName());
button.setText(R.string.select_station);
button.setOnClickListener(new AllStationsActRecyclerViewButtonClickEvent(station, activity));
button.setOnClickListener(new AllStationsActRecyclerViewButtonClickEvent(station, activity, reason));
}
}

58
app/src/main/java/cc/pogoda/mobile/pogodacc/type/ParceableFavsCallReason.java 100644
Wyświetl plik

@ -0,0 +1,58 @@
package cc.pogoda.mobile.pogodacc.type;
import android.os.Parcel;
import android.os.Parcelable;
public class ParceableFavsCallReason implements Parcelable {
public enum Reason {
FAVOURITES,
EXPORT_SELECT
}
public Reason getReason() {
return reason;
}
private Reason reason;
public ParceableFavsCallReason(Reason r) {
this.reason = r;
}
protected ParceableFavsCallReason(Parcel in) {
int reasonInt = in.readInt();
switch (reasonInt) {
case 1: reason = Reason.FAVOURITES;
case 2: reason = Reason.EXPORT_SELECT;
default: reason = null;
}
}
@Override
public void writeToParcel(Parcel dest, int flags) {
switch (reason) {
case FAVOURITES: dest.writeInt(1); break;
case EXPORT_SELECT: dest.writeInt(2); break;
}
}
@Override
public int describeContents() {
return 0;
}
public static final Creator<ParceableFavsCallReason> CREATOR = new Creator<ParceableFavsCallReason>() {
@Override
public ParceableFavsCallReason createFromParcel(Parcel in) {
return new ParceableFavsCallReason(in);
}
@Override
public ParceableFavsCallReason[] newArray(int size) {
return new ParceableFavsCallReason[size];
}
};
}

45
app/src/main/res/layout/activity_export_data.xml 100644
Wyświetl plik

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:requiresFadingEdge="horizontal|vertical"
tools:context=".activity.ExportDataActivity">
<Button
android:id="@+id/buttonSelectStationExport"
android:layout_width="362dp"
android:layout_height="47dp"
android:layout_marginStart="28dp"
android:layout_marginTop="44dp"
android:layout_marginEnd="21dp"
android:backgroundTint="#56039BE5"
android:text="@string/select_station_export"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="175dp"
android:layout_marginTop="14dp"
android:layout_marginEnd="178dp"
android:text="TextView"
android:textAllCaps="true"
android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/buttonSelectStationExport" />
<Spinner
android:id="@+id/spinnerOutputFormat"
android:layout_width="409dp"
android:layout_height="wrap_content"
android:layout_marginTop="19dp"
app:layout_constraintTop_toBottomOf="@+id/textView"
tools:layout_editor_absoluteX="1dp" />
</androidx.constraintlayout.widget.ConstraintLayout>

10
app/src/main/res/values/strings.xml
Wyświetl plik

@ -70,7 +70,7 @@
<string name="humidity_plot">Humidity Plot</string>
<string name="station_doesnt_measure">The station doesn\'t measure this parameter</string>
<string name="meters_per_second" translatable="false">m/s</string>
<string name="knots" translatable="false">kts</string>
<string name="knots" translatable="false">kn</string>
<string name="click_on_plot">Click on point on the plot</string>
<string name="sort_alphabetical">Sort in alphabetical order</string>
<string name="sort_in_adding_order">Sort in adding order</string>
@ -119,4 +119,12 @@
<string name="data_sources">Data sources</string>
<string name="callsign">APRS callsign</string>
<string name="holfuy_id" translatable="false">Holfuy ID</string>
<string name="email" translatable="false">Email</string>
<string name="csv" translatable="false">CSV</string>
<string name="xlsx" translatable="false">MS Excel XLSX</string>
<string-array name="export_formats">
<item>@string/email</item>
<item>@string/csv</item>
<item>@string/xlsx</item>
</string-array>
</resources>