Item für update der APP hinzugefügt & diverse nicht genutzte Importe in der Main gelöscht
This commit is contained in:
parent
0f3afecff1
commit
27f8312f51
@ -8,28 +8,19 @@ import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.MenuItem;
|
||||
|
||||
import android.view.Menu;
|
||||
import android.view.View;
|
||||
import android.widget.EditText;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.ListView;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.example.aped.communication.Communicator;
|
||||
import com.example.aped.ui.all_IOs.AllIOsFragment;
|
||||
import com.example.aped.ui.all_IOs.MainListViewAdapter;
|
||||
import com.example.aped.utils.ConfigurationHandler;
|
||||
import com.example.aped.utils.ExternalStorageHandler;
|
||||
import com.example.aped.utils.IFAVORITES;
|
||||
import com.example.aped.utils.IXML;
|
||||
import com.example.aped.utils.TestFavorites;
|
||||
import com.example.aped.utils.TestXML;
|
||||
import com.example.aped.utils.XMLHandler;
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
|
||||
import com.google.android.material.navigation.NavigationView;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
@ -40,17 +31,10 @@ import androidx.navigation.ui.NavigationUI;
|
||||
import androidx.drawerlayout.widget.DrawerLayout;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
|
||||
import org.xml.sax.SAXException;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
import javax.xml.parsers.ParserConfigurationException;
|
||||
|
||||
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
|
||||
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
@ -133,7 +117,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
configurationHandler.setAddress(ipAdress.getText().toString());
|
||||
configurationHandler.setPort(Integer.parseInt(port.getText().toString()));
|
||||
Toast.makeText(getApplicationContext(),
|
||||
configurationHandler.getAddress() + ":" + String.valueOf(configurationHandler.getPort()) + " is set",
|
||||
configurationHandler.getAddress() + ":" + configurationHandler.getPort() + " is set",
|
||||
Toast.LENGTH_SHORT).show();
|
||||
uebergabe = new Communicator(configurationHandler.getAddress(), configurationHandler.getPort(),
|
||||
MainActivity.this);
|
||||
@ -164,9 +148,10 @@ public class MainActivity extends AppCompatActivity {
|
||||
Log.e("MainActivity","error while opening the config.xml for adjustment: " + e.getMessage());
|
||||
}
|
||||
File xmlFile = new File(externalPrivateStorageDir, "config.xml");
|
||||
String shareBody = "gegen xml für den PI ersetzen";
|
||||
|
||||
//String shareBody = text;
|
||||
intent.setType("text/plain");
|
||||
intent.putExtra(intent.EXTRA_TEXT, shareBody);
|
||||
intent.putExtra(Intent.EXTRA_TEXT, xmlFile.toString());
|
||||
startActivity(intent);
|
||||
/**
|
||||
* xml anstatt beispieltext muss übergeben werden
|
||||
@ -175,8 +160,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
break;
|
||||
|
||||
case R.id.action_download_xml:
|
||||
ListView idListView = (ListView) findViewById(R.id.idListView);
|
||||
idListView.setAdapter(new MainListViewAdapter(this));
|
||||
Toast.makeText(this, "Downloaded .xml",
|
||||
Toast.LENGTH_SHORT).show();
|
||||
break;
|
||||
@ -184,6 +167,12 @@ public class MainActivity extends AppCompatActivity {
|
||||
Toast.makeText(this, "Upload .xml",
|
||||
Toast.LENGTH_SHORT).show();
|
||||
break;
|
||||
case R.id.action_update:
|
||||
Intent intentneustart = getIntent();
|
||||
finish();
|
||||
startActivity(intentneustart);
|
||||
break;
|
||||
|
||||
default:
|
||||
Log.e("MainActivity", "unknown item: "
|
||||
+ item.toString());
|
||||
|
@ -46,6 +46,7 @@ public class AllIOsFragment extends Fragment {
|
||||
public View onCreateView(final LayoutInflater inflater,
|
||||
final ViewGroup container,
|
||||
final Bundle savedInstanceState) {
|
||||
|
||||
this.mainActivity = (MainActivity) getActivity();
|
||||
View view = inflater.inflate(R.layout.fragment_all_ios, container,
|
||||
false);
|
||||
|
@ -21,4 +21,10 @@
|
||||
android:orderInCategory="3"
|
||||
android:title="@string/action_upload_xml"
|
||||
app:showAsAction="never" />
|
||||
<item
|
||||
android:id="@+id/action_update"
|
||||
android:icon="@android:drawable/ic_popup_sync"
|
||||
android:orderInCategory="0"
|
||||
app:showAsAction="always"
|
||||
android:title="update" />
|
||||
</menu>
|
Loading…
x
Reference in New Issue
Block a user