sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'follow-route' of https://github.com/SemvdH/Next-Location into follow-route

Browse Source
This commit is contained in:
Sem van der Hoeven
2021-01-06 15:25:36 +01:00
parent a27ebfc0c3 dabe3cfb99
commit 05c8951f2c
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/a1/nextlocation/MainActivity.java
View File

@@ -7,28 +7,20 @@ import android.app.Activity;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.MenuItem;
import com.a1.nextlocation.R;
import com.a1.nextlocation.data.Coupon;
import com.a1.nextlocation.data.FileIO;
import com.a1.nextlocation.data.Route;
import com.a1.nextlocation.fragments.HomeFragment; import com.a1.nextlocation.fragments.HomeFragment;
import com.a1.nextlocation.fragments.Refreshable;
import com.a1.nextlocation.fragments.RouteFragment; import com.a1.nextlocation.fragments.RouteFragment;
import com.a1.nextlocation.fragments.SettingsFragment; import com.a1.nextlocation.fragments.SettingsFragment;
import com.a1.nextlocation.fragments.StatisticFragment; import com.a1.nextlocation.fragments.StatisticFragment;
import com.a1.nextlocation.network.ApiHandler;
import com.a1.nextlocation.recyclerview.CouponListManager; import com.a1.nextlocation.recyclerview.CouponListManager;
import com.a1.nextlocation.recyclerview.LocationListManager; import com.a1.nextlocation.recyclerview.LocationListManager;
import com.a1.nextlocation.recyclerview.RouteListManager; import com.a1.nextlocation.recyclerview.RouteListManager;
import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.bottomnavigation.BottomNavigationView;
import java.io.File;
import java.util.Arrays;
import java.util.Locale; import java.util.Locale;
public class MainActivity extends AppCompatActivity implements Refreshable{ public class MainActivity extends AppCompatActivity implements Refreshable {
private static final String TAG = MainActivity.class.getName(); private static final String TAG = MainActivity.class.getName();
private BottomNavigationView bottomNav; private BottomNavigationView bottomNav;

2
app/src/main/java/com/a1/nextlocation/Refreshable.java → app/src/main/java/com/a1/nextlocation/fragments/Refreshable.java
View File

@@ -1,4 +1,4 @@
package com.a1.nextlocation; package com.a1.nextlocation.fragments;
public interface Refreshable { public interface Refreshable {
void refresh(); void refresh();

4
app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
View File

@@ -5,8 +5,6 @@ import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.SwitchCompat; import androidx.appcompat.widget.SwitchCompat;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
@@ -20,9 +18,7 @@ import android.widget.ArrayAdapter;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.Spinner; import android.widget.Spinner;
import com.a1.nextlocation.MainActivity;
import com.a1.nextlocation.R; import com.a1.nextlocation.R;
import com.a1.nextlocation.Refreshable;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;