diff --git a/src/main/java/zemfi/de/vertaktoid/FacsimileView.java b/src/main/java/zemfi/de/vertaktoid/FacsimileView.java
index 595baa4..eb8e2e5 100644
--- a/src/main/java/zemfi/de/vertaktoid/FacsimileView.java
+++ b/src/main/java/zemfi/de/vertaktoid/FacsimileView.java
@@ -9,7 +9,6 @@
import android.databinding.ObservableInt;
import android.os.Build;
import android.os.Bundle;
-import android.os.Environment;
import android.os.Looper;
import android.os.Parcelable;
import android.support.annotation.RequiresApi;
@@ -27,19 +26,13 @@
import android.widget.TextView;
import android.widget.Toast;
-import com.ceylonlabs.imageviewpopup.ImagePopup;
-
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.FileReader;
import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.net.UnknownHostException;
import java.util.ArrayList;
@@ -361,204 +354,6 @@ public void brushClicked() {
nextAction = Action.DRAW;
refresh();
}
- public void iiif_view() throws JSONException {
- resetState();
- final Dialog settingsDialog = new Dialog(getContext());
- Window window = settingsDialog.getWindow();
- WindowManager.LayoutParams wlp = window.getAttributes();
- wlp.gravity = Gravity.TOP;
- window.setAttributes(wlp);
- settingsDialog.setContentView(R.layout.iiif_layout);
- settingsDialog.setTitle(R.string.dialog_iifs_titel);
- final String[] regionUrl = new String[1];
- final String[] sizeurl = new String[1];
- final String[] rotationurl = new String[1];
- final String[] iiifquality = new String[1];
-
- final EditText iiif_right = (EditText) settingsDialog.findViewById(R.id.iiif_right);
- final EditText iiif_top = (EditText) settingsDialog.findViewById(R.id.iiif_top);
- final EditText iiif_width = (EditText) settingsDialog.findViewById(R.id.iiif_width);
- final EditText iiif_height = (EditText) settingsDialog.findViewById(R.id.iiif_height);
-
- final EditText iiif_right_percent = (EditText) settingsDialog.findViewById(R.id.iiif_right_percent);
- final EditText iiif_top_percent = (EditText) settingsDialog.findViewById(R.id.iiif_top_percent);
- final EditText iiif_width_percent= (EditText) settingsDialog.findViewById(R.id.iiif_width_percent);
- final EditText iiif_height_percent = (EditText) settingsDialog.findViewById(R.id.iiif_height_percent);
-
- final EditText iiifSize = (EditText) settingsDialog.findViewById(R.id.dialog_iiif_size_input);
-
- final EditText iiifrotation = (EditText) settingsDialog.findViewById(R.id.dialog_iiif_rotation_input);
-
- final RadioGroup region = (RadioGroup) settingsDialog.findViewById(R.id.regions);
- final RadioGroup quality = (RadioGroup) settingsDialog.findViewById(R.id.quality);
-
-
-
- region.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-
- @Override
- public void onCheckedChanged(RadioGroup group, int checkedId) {
- if (region.getCheckedRadioButtonId() == R.id.region_points) {
- iiif_right.setEnabled(true);
- iiif_top.setEnabled(true);
- iiif_width.setEnabled(true);
- iiif_height.setEnabled(true);
-
- }
- else if (region.getCheckedRadioButtonId() == R.id.region_percent) {
- iiif_right_percent.setEnabled(true);
- iiif_top_percent.setEnabled(true);
- iiif_width_percent.setEnabled(true);
- iiif_height_percent.setEnabled(true);
- }
- }
- });
-
- Button settingsButtonNegative = (Button) settingsDialog.findViewById(R.id.dialog_settings_button_negative);
-
- settingsButtonNegative.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- settingsDialog.cancel();
- resetState();
- resetMenu();
- invalidate();
- }
- });
-
- Button settingsButtonPositive = (Button) settingsDialog.findViewById(R.id.dialog_settings_button_positive);
- settingsButtonPositive.setOnClickListener(new OnClickListener() {
-
-
- @Override
- public void onClick(View v) {
- try {
-
- File file = new File(String.valueOf(Environment.getExternalStoragePublicDirectory(stringUrlParser())), "iiif.json");
-
- FileReader fileReader = null;
- try {
- fileReader = new FileReader(file);
- } catch (FileNotFoundException e) {
- System.out.println("File is not found");
- e.printStackTrace();
- }
- BufferedReader bufferedReader = new BufferedReader(fileReader);
- StringBuilder stringBuilder = new StringBuilder();
-
- String line = null;
- try {
- line = bufferedReader.readLine();
- } catch (IOException e) {
- System.out.println("Again ioexception");
- e.printStackTrace();
- }
- while (line != null){
- stringBuilder.append(line).append("\n");
- try {
- line = bufferedReader.readLine();
- } catch (IOException e) {
- System.out.println("Ioe exception");
- e.printStackTrace();
- }
- }
- try {
- bufferedReader.close();
- } catch (IOException e) {
- System.out.println("IOEEE exception");
- e.printStackTrace();
- }
- String responce = stringBuilder.toString();
- JSONObject jsonObject = new JSONObject(responce);
- JSONArray urls = jsonObject.getJSONArray("urls");
- if (region.getCheckedRadioButtonId() == R.id.region_full) {
- regionUrl[0] = "full";
- }
- if (region.getCheckedRadioButtonId() == R.id.region_square) {
- regionUrl[0] = "square";
- }
- if (region.getCheckedRadioButtonId() == R.id.region_points) {
- regionUrl[0] = iiif_right.getText().toString() + "," + iiif_top.getText().toString() + "," + iiif_height.getText().toString() + "," + iiif_width.getText().toString();
- }
- if (region.getCheckedRadioButtonId() == R.id.region_percent){
- regionUrl[0] = "pct:" + iiif_right_percent.getText().toString() + "," + iiif_top_percent.getText().toString() + "," + iiif_height_percent.getText().toString() + "," + iiif_width_percent.getText().toString();
-
- }
- if (quality.getCheckedRadioButtonId() == R.id.iiif_quality_color){
- iiifquality[0] = "color";
- }
- if (quality.getCheckedRadioButtonId() == R.id.iiif_quality_defualt){
- iiifquality[0] = "default.jpg";
- }
- if (quality.getCheckedRadioButtonId() == R.id.iiif_quality_gray){
- System.out.println("colot is gray");
-
- iiifquality[0] = "gray.jpg";
- }
- if (quality.getCheckedRadioButtonId() == R.id.iiif_quality_bitonal){ System.out.println("colot is clicked");
- iiifquality[0] = "bitonal.jpg";
- }
- if(iiifSize != null) {
- sizeurl[0] = iiifSize.getText().toString();
- }
- if(iiifrotation != null){
- rotationurl[0] = iiifrotation.getText().toString();
- }
- if(regionUrl[0] == null){
- regionUrl[0] = "full";
- }if( iiifquality[0] == null){
- iiifquality[0] = "default.jpg";
- } if (sizeurl[0].isEmpty()){
- sizeurl[0] = "full";
- }
- if (rotationurl[0].isEmpty()){
- rotationurl[0] = "0";
- }
- currentPageUrlId = urls.getJSONObject(document.pages.get(pageNumber.get()).number - 1);
- currentPageUrlId.get("id");
- String hostname = new URL((String) currentPageUrlId.get("url")).getHost();
- ImagePopup imagePopup = new ImagePopup(MainActivity.context);
- String[] originalurl = new String[ currentPageUrlId.get("url").toString().split("/").length];
-
- originalurl = currentPageUrlId.get("url").toString().split("/");
- originalurl[originalurl.length - 1] = iiifquality[0];
- originalurl[originalurl.length - 2] = rotationurl[0];
- originalurl[originalurl.length - 3] = sizeurl[0];
- originalurl[originalurl.length - 4] = regionUrl[0];
- System.out.println(originalurl[0]);
- String stringurl = "";
- for (String string : originalurl) {
- stringurl = stringurl + "/"+ string;
- }
- String newurl;
- newurl = stringurl.substring(1);
-
- System.out.println(originalurl.length);
- imagePopup.setWindowHeight(800); // Optional
- imagePopup.setWindowWidth(800); // Optional
- imagePopup.setFullScreen(false); // Optional
- imagePopup.setHideCloseIcon(true); // Optional
- imagePopup.setImageOnClickClose(true); // Optional
-
- imagePopup.initiatePopupWithPicasso(newurl);
- imagePopup.viewPopup();
-
- } catch (NumberFormatException | JSONException | MalformedURLException e) {
- // do nothing
- }
- resetState();
- resetMenu();
- invalidate();
- settingsDialog.dismiss();
- }
- });
-
- settingsDialog.show();
-
-
-
- }
-
/**
* Menu entry "erase" clicked.
*/
diff --git a/src/main/java/zemfi/de/vertaktoid/MainActivity.java b/src/main/java/zemfi/de/vertaktoid/MainActivity.java
index cb5aa0d..324167b 100644
--- a/src/main/java/zemfi/de/vertaktoid/MainActivity.java
+++ b/src/main/java/zemfi/de/vertaktoid/MainActivity.java
@@ -401,13 +401,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
case R.id.action_save:
item.setIcon(R.drawable.save_off);
saveclicked();
- break;
- case R.id.iiif_view:
- try {
- view.iiif_view();
- } catch (JSONException e) {
- e.printStackTrace();
- }
}
return super.onOptionsItemSelected(item);
diff --git a/src/main/res/layout/iiif_layout.xml b/src/main/res/layout/iiif_layout.xml
deleted file mode 100644
index 9797313..0000000
--- a/src/main/res/layout/iiif_layout.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/res/menu/menu_main.xml b/src/main/res/menu/menu_main.xml
index 477d608..7103981 100644
--- a/src/main/res/menu/menu_main.xml
+++ b/src/main/res/menu/menu_main.xml
@@ -83,11 +83,6 @@
android:title="Erase Measures From All Pages"
android:icon="@drawable/eraser_off"
app:showAsAction="never" />
-