Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Screenshot_about-text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Screenshot_detailed-view.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Screenshot_normal-view.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 16 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

xmlns:tools="http://schemas.android.com/tools" package="com.example.animalislands">
<uses-permission android:name="android.permission.INTERNET" />
<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
Expand All @@ -14,14 +14,27 @@
<activity
android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.AnimalIslands.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".AboutActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".DetailedActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
</application>

</manifest>
31 changes: 31 additions & 0 deletions app/src/main/java/com/example/animalislands/AboutActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.example.animalislands;

import android.os.Bundle;
import android.view.View;
import android.widget.Button;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;

public class AboutActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about);

String aboutTitle = getIntent().getStringExtra("title");

if(aboutTitle != null) {
setTitle(aboutTitle);
}
Button backButton = findViewById(R.id.back_button);

backButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
}
}
8 changes: 8 additions & 0 deletions app/src/main/java/com/example/animalislands/Auxdata.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,12 @@
public class Auxdata {
private String img;
private int population;

public String getImg() {
return img;
}

public int getPopulation() {
return population;
}
}
31 changes: 31 additions & 0 deletions app/src/main/java/com/example/animalislands/DetailedActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.example.animalislands;

import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;

public class DetailedActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.detailedview_item);

Button backButton = findViewById(R.id.back_button2);

String itemString = getIntent().getStringExtra("itemString");

TextView textView = findViewById(R.id.info); // TextView i din layout
textView.setText(itemString);
backButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
}
}
47 changes: 0 additions & 47 deletions app/src/main/java/com/example/animalislands/FirstFragment.java

This file was deleted.

20 changes: 19 additions & 1 deletion app/src/main/java/com/example/animalislands/Island.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.example.animalislands;

import androidx.annotation.NonNull;

import com.google.gson.annotations.SerializedName;

public class Island {
Expand All @@ -13,5 +15,21 @@ public class Island {
@SerializedName("size")
private int squarekm;

private Auxdata Auxdata;
private Auxdata auxdata;

public Auxdata getAuxdata() {
return auxdata;
}

public String getInfo() {
return "ID: " + id + "\nPart of: " + category + "\nSize: " + squarekm + "km²" + "\nPopulation: " + auxdata.getPopulation();
}
public String getLocation() {
return location;
}
@NonNull
public String toString() {
return name + ", " + location;
}

}
2 changes: 1 addition & 1 deletion app/src/main/java/com/example/animalislands/JsonTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public interface JsonTaskListener {
private final JsonTaskListener listener;

@SuppressWarnings("deprecation")
public JsonTask(JsonTaskListener listener) {
public JsonTask(JsonTaskListener listener, MainActivity mainActivity) {
this.listener = listener;
}

Expand Down
129 changes: 78 additions & 51 deletions app/src/main/java/com/example/animalislands/MainActivity.java
Original file line number Diff line number Diff line change
@@ -1,76 +1,103 @@
package com.example.animalislands;

import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;

import com.google.android.material.snackbar.Snackbar;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.Spinner;
import android.widget.Toast;

import androidx.navigation.NavController;
import androidx.navigation.Navigation;
import androidx.navigation.ui.AppBarConfiguration;
import androidx.navigation.ui.NavigationUI;

import com.example.animalislands.databinding.ActivityMainBinding;

import android.view.Menu;
import android.view.MenuItem;
import com.google.gson.Gson;

public class MainActivity extends AppCompatActivity {

private AppBarConfiguration appBarConfiguration;
private ActivityMainBinding binding;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

public class MainActivity extends AppCompatActivity implements JsonTask.JsonTaskListener {
private Spinner dropdownMenu;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);

binding = ActivityMainBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
Button aboutButton = findViewById(R.id.about_button);
dropdownMenu = findViewById(R.id.dropdown);

setSupportActionBar(binding.toolbar);
aboutButton.setOnClickListener(v -> {
Intent intent = new Intent(MainActivity.this, AboutActivity.class);
intent.putExtra("title", "About app");
startActivity(intent);
});
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
// Recycler widget

NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
appBarConfiguration = new AppBarConfiguration.Builder(navController.getGraph()).build();
NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);

binding.fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
}
});
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.menu_main, menu);
return true;
String JSON_URL = "https://mobprog.webug.se/json-api?login=f22linbe";
new JsonTask(this, this).execute(JSON_URL);

}

@SuppressLint("NotifyDataSetChanged")
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();

//noinspection SimplifiableIfStatement
if (id == R.id.action_settings) {
return true;
public void onPostExecute(String json) {
Gson gson = new Gson();
Island[] islands = gson.fromJson(json, Island[].class);
// Arraylists
ArrayList<String> detailedItems = new ArrayList<>();
ArrayList<RecyclerViewItem> items = new ArrayList<>();

List<String> countryItems = new ArrayList<>();

for (Island island : islands) {
items.add(new RecyclerViewItem(island.toString()));
detailedItems.add(island.getInfo());
countryItems.add(island.getLocation());
}

return super.onOptionsItemSelected(item);
ArrayAdapter<String> dropAdapter = new ArrayAdapter<>(this,android.R.layout.simple_spinner_dropdown_item, countryItems);
dropdownMenu.setAdapter(dropAdapter);

RecyclerViewAdapter adapter = new RecyclerViewAdapter(this, items, detailedItems, item -> {
Intent intent = new Intent(MainActivity.this, DetailedActivity.class);
intent.putExtra("itemString", item);
startActivity(intent);
});

RecyclerView view = findViewById(R.id.recycler_view);
view.setLayoutManager(new LinearLayoutManager(this));
view.setAdapter(adapter);

adapter.notifyDataSetChanged();

dropdownMenu.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {

@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
String selectedCountry = countryItems.get(position);

List<RecyclerViewItem> filterCountry = new ArrayList<>();

for (RecyclerViewItem item : items) {
if(item.getTitle().contains(selectedCountry)) {
filterCountry.add(item);
}
}
}

@Override
public void onNothingSelected(AdapterView<?> parent) {
}
});
}

@Override
public boolean onSupportNavigateUp() {
NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
return NavigationUI.navigateUp(navController, appBarConfiguration)
|| super.onSupportNavigateUp();
}
}
Loading