From 03842e080af58cd5d08a01a8824a6f2f55c6b43c Mon Sep 17 00:00:00 2001 From: voryzen Date: Thu, 20 Jul 2023 02:09:15 +1000 Subject: [PATCH] Fixed about spacing --- .../org/disroot/disrootapp/StatusService.java | 7 +- .../disroot/disrootapp/ui/AboutActivity.java | 2 +- .../disroot/disrootapp/ui/MainActivity.java | 122 ++++++++++-------- .../disroot/disrootapp/ui/StateActivity.java | 5 +- .../disrootapp/ui/StateMessagesActivity.java | 4 +- app/src/main/res/layout/activity_welcome.xml | 6 +- .../main/res/layout/fragment_about_help.xml | 5 +- .../res/layout/fragment_about_license.xml | 2 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 3 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 3 +- app/src/main/res/values-sr/strings.xml | 2 +- app/src/main/res/xml/changelog_master.xml | 2 +- 16 files changed, 96 insertions(+), 73 deletions(-) diff --git a/app/src/main/java/org/disroot/disrootapp/StatusService.java b/app/src/main/java/org/disroot/disrootapp/StatusService.java index 15e3cf4..bf8c682 100644 --- a/app/src/main/java/org/disroot/disrootapp/StatusService.java +++ b/app/src/main/java/org/disroot/disrootapp/StatusService.java @@ -102,8 +102,7 @@ public class StatusService extends Service { { checkDate.edit().putString( "storeDate", "stateDate").apply(); //return null; - } - else { + } else { assert stateDate != null; if (!stateDate.equals( dateStored )&& !stateDate.equals( "" ))//dateStored { @@ -125,7 +124,7 @@ public class StatusService extends Service { Toast.LENGTH_LONG) .show(); } - }else { + } else { Log.e(TAG, "Couldn't get json from server."); } return null; @@ -179,7 +178,7 @@ public class StatusService extends Service { notificationBuilder.setSound(alarmSound) .setVibrate(new long[]{50,500,100,300,50,300}) .setLights(Color.BLUE, 3000, 3000); - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){ + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { notificationBuilder.setChannelId(CHANNEL_ID); } diff --git a/app/src/main/java/org/disroot/disrootapp/ui/AboutActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/AboutActivity.java index de2cd3c..233b786 100644 --- a/app/src/main/java/org/disroot/disrootapp/ui/AboutActivity.java +++ b/app/src/main/java/org/disroot/disrootapp/ui/AboutActivity.java @@ -135,7 +135,7 @@ public class AboutActivity extends AppCompatActivity { assert getArguments() != null; View rootView; rootView = null; - switch (getArguments().getInt(ARG_SECTION_NUMBER)){ + switch (getArguments().getInt(ARG_SECTION_NUMBER)) { case 1: rootView = inflater.inflate(R.layout.fragment_about_help, container, false); diff --git a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java index 1d92439..23810d0 100644 --- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java +++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java @@ -123,7 +123,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL ScrollView dashboard = findViewById(R.id.dashboard); TranslateAnimation animateup = new TranslateAnimation(0,0,-2*dashboard.getHeight(),0); TranslateAnimation animatedown = new TranslateAnimation(0,0,0,-dashboard.getHeight()); - if(webView.getVisibility()==View.VISIBLE){ + if(webView.getVisibility()==View.VISIBLE) { //animation animateup.setDuration(500); animateup.setFillAfter(false); @@ -132,7 +132,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL webView.setVisibility(View.GONE); return; } - if (webView.getVisibility()==View.GONE && webView.getUrl()!=null){ + if (webView.getVisibility()==View.GONE && webView.getUrl()!=null) { //animation animatedown.setDuration(500); animatedown.setFillAfter(false); @@ -204,13 +204,13 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL } //set booleans for checking Chat preference - if (firstStart.getBoolean("firsttap", true)){ + if (firstStart.getBoolean("firsttap", true)) { check.edit().putBoolean("checkConv",false).apply(); check.edit().putBoolean("checkPix",false).apply(); } //set booleans for checking Mail preference - if (firstStart.getBoolean("firsttap", true)){ + if (firstStart.getBoolean("firsttap", true)) { check.edit().putBoolean("checkK9",false).apply(); check.edit().putBoolean("checkFairEmail",false).apply(); } @@ -220,7 +220,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL swipe.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override - public void onRefresh(){ + public void onRefresh() { swipe.setRefreshing( false ); String url = webView.getUrl(); webView.loadUrl(url); @@ -260,7 +260,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL Map allEntries = BtnPreference.getAll(); for (Map.Entry entry : allEntries.entrySet()) { - if (entry.getValue().equals( false )){ + if (entry.getValue().equals( false )) { ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent()); for(int i=0; i= Build.VERSION_CODES.LOLLIPOP){ + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { CookieManager.getInstance().removeAllCookies(null); - }else{ + } else { CookieManager.getInstance().removeAllCookie(); } } @@ -1662,7 +1680,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL webView.setWebChromeClient(new ChromeClient()); webView.loadUrl(loadUrl); - this.webView.setWebViewClient(new WebViewClient(){ + this.webView.setWebViewClient(new WebViewClient() { @Override public void onPageFinished(WebView view, String url) { super.onPageFinished(view, url); @@ -1688,7 +1706,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL }); } - public boolean handleUrl(String url){ + public boolean handleUrl(String url) { if (url.startsWith("geo:") || url.startsWith("mailto:") || url.startsWith("tel:") || url.startsWith("sms:")|| url.startsWith("xmpp:")) { Intent searchAddress = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); @@ -1878,15 +1896,15 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL chooserPathUri = filePath; chooserParams = fileChooserParams; - if(checkAndRequestPermissions()){ + if(checkAndRequestPermissions()) { openChooser(chooserPathUri); return true; - }else { + } else { return false; } } - void openChooser(ValueCallback filePath){ + void openChooser(ValueCallback filePath) { // Double check that we don't have any existing callbacks if (mFilePathCallback != null) { mFilePathCallback.onReceiveValue(null); @@ -2020,7 +2038,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL // adding each child node to HashMap key => value //serviceDetails.put("id", id); serviceDetails.put("name", name); - if (c.has("description")&&!c.isNull("description")){ + if (c.has("description")&&!c.isNull("description")) { String description = c.getString("description"); serviceDetails.put("description", description); } else { @@ -2067,7 +2085,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL HashMap hashmap= (HashMap) componentList.get(a); String hash = hashmap.get("name"); String description = ""; - if (hashmap.get("description")!=null &&!hashmap.isEmpty()){//.has("description")&&!hasmap.isNull("description") + if (hashmap.get("description")!=null &&!hashmap.isEmpty()) {//.has("description")&&!hasmap.isNull("description") description = hashmap.get("description"); } else { description ="No Description"; diff --git a/app/src/main/java/org/disroot/disrootapp/ui/StateActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/StateActivity.java index 3008dee..87ba9ad 100644 --- a/app/src/main/java/org/disroot/disrootapp/ui/StateActivity.java +++ b/app/src/main/java/org/disroot/disrootapp/ui/StateActivity.java @@ -128,11 +128,10 @@ public class StateActivity extends AppCompatActivity { for (int i = 0; i < data.length(); i++) { JSONObject c = data.getJSONObject(i); HashMap service = new HashMap<>(); - if (c.has("description")&&!c.isNull("description")){ + if (c.has("description")&&!c.isNull("description")) { String description = c.getString("description"); service.put("description", description); - } - else { + } else { service.put("description", "No Description"); } diff --git a/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java index ac063a8..732f823 100644 --- a/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java +++ b/app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java @@ -150,7 +150,7 @@ public class StateMessagesActivity extends AppCompatActivity { Toast.LENGTH_LONG) .show() ); } - }else { + } else { Log.e(TAG, "Couldn't get json from server."); runOnUiThread( () -> Toast.makeText(getApplicationContext(), "Couldn't get json from server. Is your internet connection ok?", @@ -194,7 +194,7 @@ public class StateMessagesActivity extends AppCompatActivity { //Make Last updated translatable TextView updated = v.findViewById(R.id.category ); String updatedValue = updated.getText().toString(); - if (updatedValue.startsWith("Last Updated: ")){ + if (updatedValue.startsWith("Last Updated: ")) { updated.setText(updatedValue.replace("Last Updated: ",getText(R.string.LastUpdated))); } //Make Scheduled at translatable diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml index 2ce4c6c..fc86119 100644 --- a/app/src/main/res/layout/activity_welcome.xml +++ b/app/src/main/res/layout/activity_welcome.xml @@ -38,7 +38,8 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin"> + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin"> + android:contentDescription="@string/app_name" /> + + android:layout_marginBottom="16dp" + android:text="@string/SpreadTheWord"/> Disroot ist eine Plattform, auf der Online-Dienste angeboten werden, die auf den Prinzipien von Freiheit, Privatsphäre, Gemeinschaft und Dezentralisierung basieren.\nDiese App ist wie ein Schweizer Taschenmesser für die Disroot-Plattform, von der Community für die Community.\nAuch wenn du keinen Disroot-Account hast, kannst Du diese App trotzdem nutzen, um auf alle Disroot-Dienste zuzugreifen, die kein Benutzerkonto erfordern:\n \ \ \ • Etherpad\n \ \ \ • Cryptpad\n \ \ \ • Private bin\n \ \ \ • Upload\n \ \ \ • Searx\n \ \ \ • Diaspora* (separater Diaspora Account benötigt)\n\nDiese App wird Dich eventuell darum bitten, weitere Apps zu installieren. Wir empfehlen F-Droid zu installieren - einen kostenlosen und quelloffenen App-Katalog - da nicht alle verwendeten Apps im Google Play Store zu finden sind und F-Droid außerdem mehr auf Datenschutz ausgerichtet ist (kein Tracking, kein Account erforderlich). Du kannst F-Droid herunterladen, indem Du auf das F-Droid-Symbol klickst.\n Hilfe Lizenz diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 31a3d9d..2a04874 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -30,9 +30,8 @@ Configuración de Nextcloud: Sincroniza y comparte tus archivos, calendarios, contactos y más.\n\nHost:\n https://cloud.disroot.org\n\nUsuarix: tu_usuarix_de_disroot\nContraseña:tu_contraseña_de_Disroot. Bienvenidx + Disroot es una plataforma que provee servicios en línea basados en los principios de libertad, privacidad, federación y descentralización.\nEsta aplicación es como la navaja suiza de la plataforma, hecha por la comunidad, para la comunidad.\nSi no tienes una cuenta de Disroot, igual puedes usarla para acceder a aquellos servicios que no requieran de una:\nEtherpad, Cryptpad, Privatebin, Upload, Encuentas, Searx y Diaspora* (requiere tener cuenta solo de Diaspora*)\nLa aplicación podría solicitarte la instalación de otras adicionales, y no todas pueden encontrarse en la Tienda de Aplicaciones. Nosotros recomendamos instalar F-Droid. Si no la tienes, puedes descargarla tocando el logo de F-Droid.\n - - Ayuda Licencia Configuraciones diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c56f212..abfcd6d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -57,8 +57,8 @@ \nMot de passe : \n votre_mot_de_passe_disroot. Bienvenue + Disroot est une plate-forme fournissant des services en ligne basés sur les principes de liberté, de confidentialité, de fédération et de décentralisation.\nCette application est comme votre couteau suisse vers la plate-forme Disroot, faite par la communauté pour la communauté. Si vous n\'avez pas un compte Disroot vous pouvez toujours utiliser cette application pour accéder aux services Disroot qui n\'en nécessitent pas:\n \ \ \ • Etherpad\n \ \ \ • Cryptpad\n \ \ \ • Private bin\n \ \ \ • Téléverser\n \ \ \ • Sondage\n \ \ \ • Searx\n \ \ \ • Diaspora* (nécessite un compte Diaspora)\n\nL\'application peut vous demander d\'installer des applications supplémentaires. Nous vous recommandons fortement d\'installer F-Droid - un catalogue d\'applications gratuit et open source - car toutes les applications ne se trouvent pas sur le Play Store de Google et F-Droid est plus orienté vers la confidentialité (pas de suivi, pas besoin de compte) vous pouvez le télécharger en tapant sur l\'icône F-droid.\n - Aide Licence d\'utilisation Paramètres diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b843720..7733811 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -26,6 +26,7 @@ Impostazioni Nextcloud Tieni i tuoi dati sincronizzati e al sicuro. Con Nextcloud puoi condividere file, calendari, contatti e altro ancora.\n\nHost:\n https://cloud.disroot.org\n\nnnome utente:\n il_tuo_nome_utente_disroot\n\nPassword:\n la_tua_password_disroot Benvenuto + Disroot è una piattaforma che fornisce servizi online basati su principi di libertà, privacy, federazione e decentralizzazione.\nQuesta applicazione è come il tuo coltellino svizzero per la piattaforma Disroot, fatta dalla comunità per la comunità.\nSe non hai un account Disroot puoi comunque utilizzare questa app per accedere a tutti i servizi Disroot che non richiedono un account:\n \ \ \ • Etherpad\n \ \ \ • Cryptpad\n \ \ \ • Private bin\n \ \ \ • Upload\n \ \ \ • Searx\n \ \ \ • Diaspora* (richiede un conto solo per Diaspora)\n\nLa app potrebbe richiedere l\'installazione di applicazioni aggiuntive. Si consiglia vivamente di installare F-Droid - una app sotre gratuita e open source - in quanto non tutte le applicazioni possono essere trovate su Google Play Store e F-Droid è più orientato alla privacy (nessun tracking, nessun account necessario) è possibile scaricarlo toccando l\'icona F-Droid.\n Aiuto Licenza diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 3c1b55e..1f8c95d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -30,8 +30,8 @@ Nextcloud Instellingen Houd uw gegevens gesynchroniseerd en veilig. Met Nextcloud kunt u uw bestanden, kalenders, contactpersonen en meer delen.\n\nHost:\n https://cloud.disroot.org\n\nGebruikersnaam:\n uw_disroot_gebruikersnaam\n\nWachtwoord:\n uw_disroot_wachtwoord. Welkom + Disroot is een platform dat online diensten aanbiedt op basis van de principes van vrijheid, privacy, federatie en decentralisatie.\n Deze app is als een Zwitsers mes voor het Disroot platform, gemaakt door de gemeenschap voor de gemeenschap.\nAls je geen Disroot account hebt kun je deze app nog steeds gebruiken om toegang te krijgen tot alle Disroot diensten dat geen account vereist:\n \ \ \ • Cryptpad\n \ \ \ • Cryptpad\n \ \ \ • Private bin\n \ \ \ • Upload\n \ \ \ • Searx\n \ \ \ • Diaspora* (vereist een Diaspora elleen account)\n\nDe app kan vereisen dat u extra apps installeert. We raden u ten zeerste aan om F-Droid - een gratis en open source app marktplaats te installeren, omdat niet alle apps te vinden zijn in de Play Store van Google en F-Droid meer privacy georiënteerd is (geen tracking, geen account nodig), u kunt het downloaden door op het F-droid icoontje te tikken.\n - Help Licentie Instellingen diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 12e00f5..03fcb31 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -30,8 +30,9 @@ Definições Nextcloud Mantenha os seus dados sincronizados e seguros. Com o Nextcloud pode partilhar os seus ficheiros calendários, contactos e mais.\n\nHost:\n https://cloud.disroot.org\n\nNome de utilizador:\n O_seu_nome_de_utilizador_disroot\n\nPassword:\n a_sua_password_do_disroot. Bem Vindo + + O Disroot é uma plataforma baseada nos princípios de liberdade, privacidade, federação e descentralização que fornece serviços online.\nEsta aplicação é como um Canivete Suíço para a plataforma Disroot, feito pela comunidade para a comunidade.\nSe não tem uma conta Disroot pode utilizar esta aplicação para aceder a todos os serviços do Disroot que não precisam de uma conta de utilizador:\n \ \ \ • Cryptpad\n \ \ \ • Cryptpad\n \ \ \ • Private bin\n \ \ \ • Upload\n \ \ \ • Searx\n \ \ \ • Diaspora* (requer uma conta apenas para o Diaspora)\n\nA aplicação pode pedir que instale outras aplicações adicionais. Nós recomendamos vivamente que instale o F-Droid - uma loja de aplicações livres e open source - porque nem todas as aplicações podem ser encontradas na Play Store Google e o F-Droid é mais focado na privacidade (sem tracking, sem preciso criar conta de utilizador) pode descarregar o F-droid carregando no ícone F-droid.\n - Ajuda Licença Definições diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 96bc0c7..f69b297 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -30,8 +30,8 @@ Nextcloud podešavanja Sinhronizujte i osigurajte vaše podatke. Pomoću Nextcloud usluge možete deliti vaše datoteke, kalendare, kontakte i još mnogo toga.\n\nServer:\n https://cloud.disroot.org\n\nKorisničko ime:\n vaše_disroot_korisničko ime\n\nLozinka:\n vaša_disroot_lozinka. Dobro došli + Disroot platforma obezbeđuje internet usluge zasnovane na principima slobode, privatnosti, federacije i decentralizacije.\nOva aplikacija je višenamenska alatka za Disroot platformu, koju su članovi zajednice napravili za zajednicu.\nAko nemate nalog na Disroot platformi, možete koristiti ovu aplikaciju za pristup svim Disroot uslugama za koje nije potreban nalog:\n \ \ \ • Cryptpad\n \ \ \ • Cryptpad\n \ \ \ • PrivateBin\n \ \ \ • Otpremi\n \ \ \ • Searx\n \ \ \ • Diaspora* (potreban zaseban Diaspora nalog)\n\nOva aplikacija možda će zahtevati instalaciju dodatnih aplikacija. Preporučujemo da instalirate F-Droid, besplatnu prodavnicu otvorenog koda, jer pojedine aplikacije nisu dostupne na Play prodavnici, a pritom F-Droid nudi više privatnosti (nema praćenja, nije potreban nalog). Aplikaciju možete preuzeti dodirom na F-droid ikonicu.\n - Pomoć Licenca Podešavanja diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index 93d0769..d77ec02 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -2,7 +2,7 @@ Added Akkoma - Added Jitsi + Fixed some code decrepancies with Jitsi General Information Update