Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
157432a
Initial commit
noahzpepper Sep 16, 2017
a262b3b
Initial android studio commit
noahzpepper Sep 16, 2017
5a37750
Add Pokedex.java starter code
noahzpepper Sep 16, 2017
63b91c0
Fix package name in Pokedex.java
noahzpepper Sep 16, 2017
a790af6
Pokedex list view displays all pokemon with image
noahzpepper Sep 19, 2017
f4b698c
Support for grid/list view switching
noahzpepper Sep 19, 2017
16cdc48
Implement search filtering
noahzpepper Sep 19, 2017
68e55ff
Setup for filtering screen, refactoring and improvements
noahzpepper Sep 20, 2017
e17972a
More smaller changes for code quality, bugfixing search bar
noahzpepper Sep 20, 2017
5fc63b6
Start work for FilterActivity
noahzpepper Sep 21, 2017
e802c08
Finish Profile
paulshaoyuqiao Sep 21, 2017
0e7fe0f
Merge profile and pokelist
noahzpepper Sep 21, 2017
18bca26
Misc. work on filter activity
noahzpepper Sep 22, 2017
6223d83
Added Checkboxes
paulshaoyuqiao Sep 22, 2017
dd058f1
Updated Checkboxes
paulshaoyuqiao Sep 22, 2017
3ba784e
Updated Button and Checkbox
paulshaoyuqiao Sep 22, 2017
6847e81
NEW
paulshaoyuqiao Sep 22, 2017
3c6ab26
NEW2
paulshaoyuqiao Sep 22, 2017
504abed
NEW
paulshaoyuqiao Sep 22, 2017
94f5977
Getting filtering working and finishing up
noahzpepper Sep 22, 2017
c678750
Getting filtering working and finishing up
noahzpepper Sep 22, 2017
c8f7441
Merge branch 'develop' of https://github.com/noahzpepper/pokedex into…
noahzpepper Sep 22, 2017
463f7a8
New3
paulshaoyuqiao Sep 22, 2017
a514476
Bugfixing and code cleanup
noahzpepper Sep 22, 2017
b69f054
Fix merge conflict
noahzpepper Sep 22, 2017
605f0a8
Merge branch 'master' of https://github.com/MobileDevelopersOfBerkele…
noahzpepper Sep 22, 2017
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
55 changes: 55 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Built application files
*.apk
*.ap_

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/

# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# Intellij
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/dictionaries
.idea/libraries

# Keystore files
*.jks

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

# Google Services (e.g. APIs or Firebase)
google-services.json

# Freeline
freeline.py
freeline/
freeline_project_description.json
22 changes: 22 additions & 0 deletions .idea/compiler.xml

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

3 changes: 3 additions & 0 deletions .idea/copyright/profiles_settings.xml

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

10 changes: 10 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

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

7 changes: 7 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

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

36 changes: 36 additions & 0 deletions .idea/misc.xml

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

9 changes: 9 additions & 0 deletions .idea/modules.xml

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

12 changes: 12 additions & 0 deletions .idea/runConfigurations.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

1 change: 1 addition & 0 deletions app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
36 changes: 36 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion "26.0.1"
defaultConfig {
applicationId "com.example.nzp.pokedex"
minSdkVersion 15
targetSdkVersion 26
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})

compile 'com.android.support:appcompat-v7:26.0.0-alpha1'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.android.support:recyclerview-v7:26.0.0-alpha1'
compile 'com.android.support:cardview-v7:26.0.0-alpha1'
compile 'com.squareup.picasso:picasso:2.5.2'
testCompile 'junit:junit:4.12'
compile 'com.squareup.picasso:picasso:2.5.2'
compile fileTree(dir: 'libs', include: ['*.jar'])
}
25 changes: 25 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /Users/nzp/Library/Android/sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# Add any project specific keep options here:

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.example.nzp.pokedex;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.*;

/**
* Instrumentation test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("com.example.nzp.pokedex", appContext.getPackageName());
}
}
27 changes: 27 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.nzp.pokedex">
<uses-permission android:name="android.permission.INTERNET" />

<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".FilterActivity"></activity>
<activity android:name=".PokemonDisplay">
</activity>
</application>

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

/**
* Created by nzp on 9/19/17.
*
* An enum representing the possible styles to display the list of Pokemon, LIST and GRID.
*/

public enum DisplayStyle {

LIST,
GRID;

/* Gets the other style. */
public static DisplayStyle other(DisplayStyle thisStyle) {
if (thisStyle == LIST) {
return GRID;
}
return LIST;
}

/* Return string representation. */
@Override
public String toString() {
if (this == LIST) {
return "Grid";
}
return "List";
}
}
Loading