Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b29f0f7
Added buttons and textview stuff
CalyxLiu Feb 18, 2016
da6a7ce
rebase and merge
CalyxLiu Feb 18, 2016
f25de50
add scale checkbox and remove merge text
Meshiest Feb 18, 2016
745f2fd
Merge pull request #1 from Meshiest/fix-merge
Meshiest Feb 18, 2016
1f07382
fixed the messed up merge chris somehow managed
Meshiest Feb 19, 2016
4bfa3ab
Merge pull request #2 from Meshiest/fix-merge2
Meshiest Feb 19, 2016
81536df
Fixed counter reset on orientation change
ChrisPitts Feb 19, 2016
6a3059f
Added drawbridge to defense picked menu
ChrisPitts Feb 22, 2016
add3f8e
Defense image buttons say the name of the defense
ChrisPitts Feb 22, 2016
0423c5a
implemented low bar buttons
ChrisPitts Feb 23, 2016
f352d58
Moved defense image to teleop and make the defense selection a gridview
ChrisPitts Feb 23, 2016
d457bc0
added shots arraylist to match record
ChrisPitts Feb 23, 2016
962cbaa
Merge pull request #3 from ChrisPitts/patch-2
Meshiest Feb 23, 2016
0bac8d5
added string match names and a spinner to match selection
Meshiest Feb 24, 2016
0adde0d
removed debug message
Meshiest Feb 24, 2016
f69e857
changed sugar ORM version
ChrisPitts Feb 24, 2016
36c80fb
Match scout doesnt close if save fails
ChrisPitts Feb 24, 2016
72f98cc
Merge pull request #8 from Meshiest/string-matchname
Meshiest Feb 25, 2016
669feb8
Update PitScout.java
timcampy118 Feb 25, 2016
da46732
Merge pull request #9 from ChrisPitts/patch-1
Meshiest Feb 25, 2016
184bc8c
fixed sugar version and pitscout errors
Meshiest Feb 28, 2016
9b20fab
Merge pull request #13 from Meshiest/fix-record
Meshiest Feb 28, 2016
7651864
Update PitRecord.java
timcampy118 Feb 27, 2016
9381a6c
removed calls to missing functions in editableRecord
Meshiest Feb 28, 2016
f23fb2f
mend
Meshiest Feb 28, 2016
ed6c6dd
Merge pull request #14 from Meshiest/removePitScout
Meshiest Feb 28, 2016
4c89812
saving match scout updates match scout menu
ChrisPitts Feb 29, 2016
93f8ba6
When a duplicate match gets added, the match gets updated
ChrisPitts Mar 1, 2016
0334129
sorts match cards by match number and match type
ChrisPitts Mar 1, 2016
61e9422
fixed IndexOutOfBounds
ChrisPitts Mar 1, 2016
c92d68e
added checkbox import statement
ChrisPitts Mar 1, 2016
4aed750
fixed incorrect method calls
ChrisPitts Mar 1, 2016
661a464
Added delete database button
ChrisPitts Mar 1, 2016
701c70e
Added delete database button
ChrisPitts Mar 1, 2016
343def8
changed database version to 3
ChrisPitts Mar 2, 2016
d6cb165
Merge pull request #15 from ChrisPitts/patch-1
timcampy118 Mar 3, 2016
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
2 changes: 1 addition & 1 deletion .idea/gradle.xml

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

2 changes: 1 addition & 1 deletion app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 23 Platform (1)" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
android:value="chAPPreciate.db"/>
<meta-data
android:name="VERSION"
android:value="2"/>
android:value="3"/>
<meta-data
android:name="QUERY_LOG"
android:value="true"/>
Expand Down Expand Up @@ -68,7 +68,8 @@
android:name=".activities.ViewPitScout"
android:label="View Pit"/>
<activity
android:name=".activities.MatchScoutOneTeam"/>
android:name=".activities.MatchScoutOneTeam"
android:configChanges="orientation|screenSize"/>
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;

public class MainActivity extends BaseActivity {
public class

MainActivity extends BaseActivity {

MainPagerAdapter scouts;
TabLayout tabLayout;
Expand Down Expand Up @@ -320,6 +322,9 @@ public boolean onOptionsItemSelected(MenuItem menuitem) {
startActivity(Intent.createChooser(mailIntent, "Send Email"));
}
break;
case R.id.delete_database_menu:
deleteDatabaseButtonClicked();
break;
}

return true;
Expand Down Expand Up @@ -435,6 +440,28 @@ public String getLastPathComponent(String filePath) {
String[] segments = filePath.split("/");
return segments[segments.length - 1];
}

public void deleteDatabaseButtonClicked()
{
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Are you sure you want to delete the database?");
builder.setMessage("This will restrt the app");
builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
deleteDatabase("chAPPreciate.db");
finish();
}
});
builder.setNegativeButton("No", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {

}
});
builder.show();

}


}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close);
settings = PreferenceManager.getDefaultSharedPreferences(MainActivity.singleton);
alliance = new AlliancePagerAdapter(getSupportFragmentManager(), Integer.parseInt(matchNumber), Integer.parseInt(intent.getStringExtra("team1")), Integer.parseInt(intent.getStringExtra("team2")), Integer.parseInt(intent.getStringExtra("team3")));
alliance = new AlliancePagerAdapter(getSupportFragmentManager(), matchNumber, Integer.parseInt(intent.getStringExtra("team1")), Integer.parseInt(intent.getStringExtra("team2")), Integer.parseInt(intent.getStringExtra("team3")));
viewPager = (ViewPager) findViewById(R.id.viewPager);
viewPager.setOffscreenPageLimit(2);
viewPager.setAdapter(alliance);
Expand Down
Loading