-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add BrowseCodeActivity and Fixes on CloneService
(#21)
- Loading branch information
Showing
16 changed files
with
594 additions
and
73 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
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
158 changes: 158 additions & 0 deletions
158
app/src/main/java/com/iyxan23/sketch/collab/online/BrowseCodeActivity.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,158 @@ | ||
| package com.iyxan23.sketch.collab.online; | ||
|
|
||
| import androidx.appcompat.app.AppCompatActivity; | ||
|
|
||
| import android.annotation.SuppressLint; | ||
| import android.content.Intent; | ||
| import android.os.Bundle; | ||
| import android.os.Handler; | ||
| import android.os.Looper; | ||
| import android.view.View; | ||
| import android.widget.TextView; | ||
| import android.widget.Toast; | ||
|
|
||
| import com.google.android.gms.tasks.Tasks; | ||
| import com.google.firebase.firestore.CollectionReference; | ||
| import com.google.firebase.firestore.DocumentReference; | ||
| import com.google.firebase.firestore.DocumentSnapshot; | ||
| import com.google.firebase.firestore.FirebaseFirestore; | ||
| import com.google.firebase.firestore.Query; | ||
| import com.google.firebase.firestore.QuerySnapshot; | ||
| import com.google.firebase.firestore.Source; | ||
| import com.iyxan23.sketch.collab.R; | ||
| import com.iyxan23.sketch.collab.Util; | ||
| import com.iyxan23.sketch.collab.models.SketchwareProject; | ||
|
|
||
| import org.json.JSONException; | ||
| import org.json.JSONObject; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.HashMap; | ||
| import java.util.LinkedList; | ||
| import java.util.concurrent.ExecutionException; | ||
|
|
||
| import name.fraser.neil.plaintext.diff_match_patch; | ||
|
|
||
| public class BrowseCodeActivity extends AppCompatActivity { | ||
|
|
||
| TextView code_logic; | ||
| TextView code_view; | ||
| TextView code_file; | ||
| TextView code_library; | ||
| TextView code_resource; | ||
|
|
||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
| setContentView(R.layout.activity_browse_code); | ||
|
|
||
| // Bind these textviews | ||
| code_logic = findViewById(R.id.code_logic ); | ||
| code_view = findViewById(R.id.code_view ); | ||
| code_file = findViewById(R.id.code_file ); | ||
| code_library = findViewById(R.id.code_library ); | ||
| code_resource = findViewById(R.id.code_resource ); | ||
|
|
||
| // Get the project key and project name | ||
| Intent intent = getIntent(); | ||
| String project_key = intent.getStringExtra("project_key" ); | ||
| String project_name = intent.getStringExtra("project_name" ); | ||
|
|
||
| ((TextView) findViewById(R.id.project_name)).setText("on " + project_name); | ||
|
|
||
| // Fetch the snapshot of the project | ||
| new Thread(() -> { | ||
| try { | ||
| FirebaseFirestore firestore = FirebaseFirestore.getInstance(); | ||
| CollectionReference project_snapshot = firestore.collection("projects").document(project_key).collection("snapshot"); | ||
| CollectionReference project_commits = firestore.collection("projects").document(project_key).collection("commits"); | ||
|
|
||
| // Project data in their decrypted string format | ||
| HashMap<String, String> project_data = new HashMap<>(); | ||
|
|
||
| String[] keys = new String[] {"mysc_project", "logic", "view", "library", "resource", "file"}; | ||
|
|
||
| // Get the snapshot, get the commits, and apply the commits to the snapshot | ||
| QuerySnapshot snapshot = Tasks.await(project_snapshot.get()); | ||
| QuerySnapshot commits = Tasks.await(project_commits .orderBy("timestamp", Query.Direction.ASCENDING).get()); | ||
|
|
||
| for (DocumentSnapshot doc: snapshot.getDocuments()) { | ||
| project_data.put(doc.getId(), Util.decrypt(doc.getBlob("data").toBytes())); | ||
| } | ||
|
|
||
| diff_match_patch dmp = new diff_match_patch(); | ||
| // Apply the patch | ||
| for (DocumentSnapshot commit: commits) { | ||
| HashMap<String, String> patch = (HashMap<String, String>) commit.get("patch"); | ||
|
|
||
| if (patch == null) continue; | ||
|
|
||
| for (String key: keys) { | ||
| if (!patch.containsKey(key)) continue; | ||
|
|
||
| LinkedList<diff_match_patch.Patch> patches = (LinkedList<diff_match_patch.Patch>) dmp.patch_fromText(patch.get(key)); | ||
| // TODO: CHECK PATCH STATUSES | ||
| Object[] result = dmp.patch_apply(patches, project_data.get(key)); | ||
|
|
||
| project_data.put(key, (String) result[0]); | ||
| } | ||
| } | ||
|
|
||
| runOnUiThread(() -> { | ||
| code_logic.setText(project_data.get("logic")); | ||
| code_view.setText(project_data.get("view")); | ||
| code_file.setText(project_data.get("file")); | ||
| code_library.setText(project_data.get("library")); | ||
| code_resource.setText(project_data.get("resource")); | ||
| }); | ||
|
|
||
| } catch (InterruptedException | ExecutionException e) { | ||
| e.printStackTrace(); | ||
|
|
||
| Toast.makeText(this, "An error occured: " + e.getMessage(), Toast.LENGTH_SHORT).show(); | ||
| } | ||
| }).start(); | ||
| } | ||
|
|
||
| @SuppressLint("WrongConstant") | ||
| public void chevron_logic(View view) { | ||
| // Kinda hacky, but this code is to toggle the view's visibility between VISIBLE (0x0) and GONE (0x8) | ||
| // I don't really like the branching way of doing it, so I'm doing it mathematically | ||
| code_logic.setVisibility(code_logic.getVisibility() ^ View.GONE); | ||
|
|
||
| // Rotate the chevron 180 degree(s) | ||
| view.setRotation((view.getRotation() + 180) % 360); | ||
| } | ||
|
|
||
| @SuppressLint("WrongConstant") | ||
| public void chevron_view(View view) { | ||
| code_view.setVisibility(code_view.getVisibility() ^ View.GONE); | ||
|
|
||
| // Rotate the chevron 180 degree(s) | ||
| view.setRotation((view.getRotation() + 180) % 360); | ||
| } | ||
|
|
||
| @SuppressLint("WrongConstant") | ||
| public void chevron_file(View view) { | ||
| code_file.setVisibility(code_file.getVisibility() ^ View.GONE); | ||
|
|
||
| // Rotate the chevron 180 degree(s) | ||
| view.setRotation((view.getRotation() + 180) % 360); | ||
| } | ||
|
|
||
| @SuppressLint("WrongConstant") | ||
| public void chevron_library(View view) { | ||
| code_library.setVisibility(code_library.getVisibility() ^ View.GONE); | ||
|
|
||
| // Rotate the chevron 180 degree(s) | ||
| view.setRotation((view.getRotation() + 180) % 360); | ||
| } | ||
|
|
||
| @SuppressLint("WrongConstant") | ||
| public void chevron_resource(View view) { | ||
| code_resource.setVisibility(code_resource.getVisibility() ^ View.GONE); | ||
|
|
||
| // Rotate the chevron 180 degree(s) | ||
| view.setRotation((view.getRotation() + 180) % 360); | ||
| } | ||
| } |
Oops, something went wrong.