-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
81 changed files
with
1,515 additions
and
837 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
app/src/main/java/com/pluscubed/plustimer/model/BldSolve.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package com.pluscubed.plustimer.model; | ||
|
|
||
| /** | ||
| * Blind solves data object | ||
| */ | ||
| public class BldSolve extends Solve { | ||
| private long mInspectionTime; | ||
|
|
||
| public BldSolve(ScrambleAndSvg scramble, long solveTime, long inspectionTime) { | ||
| super(scramble, solveTime + inspectionTime); | ||
| mInspectionTime = inspectionTime; | ||
| } | ||
|
|
||
| public long getInspectionTime() { | ||
| return mInspectionTime; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
app/src/main/java/com/pluscubed/plustimer/model/ScrambleAndSvg.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,6 @@ | |
| import android.net.Uri; | ||
| import android.os.Bundle; | ||
| import android.support.annotation.Nullable; | ||
| import android.support.v7.app.ActionBarActivity; | ||
| import android.support.v7.widget.Toolbar; | ||
| import android.view.LayoutInflater; | ||
| import android.view.MenuItem; | ||
|
|
@@ -18,17 +17,12 @@ | |
|
|
||
| import com.pluscubed.plustimer.BuildConfig; | ||
| import com.pluscubed.plustimer.R; | ||
| import com.pluscubed.plustimer.model.PuzzleType; | ||
|
|
||
| import java.io.BufferedReader; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.InputStreamReader; | ||
| import com.pluscubed.plustimer.utils.Util; | ||
|
|
||
| /** | ||
| * About Page | ||
| */ | ||
| public class AboutActivity extends ActionBarActivity { | ||
| public class AboutActivity extends ThemableActivity { | ||
|
|
||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) { | ||
|
|
@@ -106,7 +100,7 @@ public void onClick(View v) { | |
| "mailto", "[email protected]", null)); | ||
| startActivity( | ||
| Intent.createChooser(intent, | ||
| "Send email to the developer using...")); | ||
| getString(R.string.send_email))); | ||
| } | ||
| }); | ||
|
|
||
|
|
@@ -128,41 +122,11 @@ public void onClick(View v) { | |
| } | ||
| }); | ||
|
|
||
| //TODO: Remove once History bug fixed | ||
| Button bug = (Button) view.findViewById(R.id.fragment_about_email_history_button); | ||
| bug.setOnClickListener(new View.OnClickListener() { | ||
| Button send = (Button) view.findViewById(R.id.fragment_about_email_history_button); | ||
| send.setOnClickListener(new View.OnClickListener() { | ||
| @Override | ||
| public void onClick(View v) { | ||
| BufferedReader r = null; | ||
| StringBuilder total = new StringBuilder(); | ||
| for (PuzzleType p : PuzzleType.values()) { | ||
| try { | ||
| total.append("\n\n\n").append(p.name()); | ||
| InputStream in = getActivity().openFileInput(p.name() + ".json"); | ||
| r = new BufferedReader(new InputStreamReader(in)); | ||
| String line; | ||
| while ((line = r.readLine()) != null) { | ||
| total.append(line); | ||
| } | ||
| } catch (IOException e) { | ||
| e.printStackTrace(); | ||
| } finally { | ||
| if (r != null) { | ||
| try { | ||
| r.close(); | ||
| } catch (IOException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| Intent intent = new Intent(Intent.ACTION_SENDTO, | ||
| Uri.fromParts( | ||
| "mailto", "[email protected]", null)); | ||
| intent.putExtra(Intent.EXTRA_TEXT, total.toString()); | ||
| startActivity( | ||
| Intent.createChooser(intent, | ||
| "Send email using...")); | ||
| Util.sendHistoryDataEmail(getActivity()); | ||
|
|
||
| } | ||
| }); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.