diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 057127e8a8b8a4a9e883c36d86a2c37290516da4..132b5ec0eb1f5da1765d0626a683a315000c3af0 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/README.md b/README.md index 9a250e2d024054b7a9e2364d1a0e10fc82dcdba8..1cd16c6f86eee1c137db0a6482daecdcdd4b557c 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ The app may require you to install additional apps. We highly recommend you inst * English * Spanish * French +* Italian --- ### Licensing diff --git a/app/build.gradle b/app/build.gradle index 5716f23c04b648b0506c182445b52f0680655f60..9f793f8b99829518714ea9aa0d7357cd1e952821 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "org.disroot.disrootapp" minSdkVersion 15 targetSdkVersion 28 - versionCode 6 - versionName "0.9.1" + versionCode 7 + versionName "0.9.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { 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 323204912cb8a524c452360ab64a96162801c0a7..4bbec2de432438c1019c8fd7b4900570d4ff7312 100644 --- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java +++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java @@ -109,7 +109,6 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL // enables the activity icon as a 'home' button. required if "android:targetSdkVersion" > 14 //getActionBar().setHomeButtonEnabled(true); - final ScrollView dashboard = findViewById(R.id.dashboard); //progressbarLoading @@ -141,6 +140,13 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL if (cl.isFirstRun()) { cl.getLogDialog().show(); } + + //set booleans for checking Chat preference + if (firstStart.getBoolean("firsttap", true)){ + check.edit().putBoolean("checkConv",false).apply(); + check.edit().putBoolean("checkPix",false).apply(); + } + //Set buttons // Locate the button in activity_main.xml button = findViewById(R.id.MailBtn);//MailBtn @@ -1098,7 +1104,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL } return super.onKeyDown(keyCode, event); } - + @Override public boolean onPrepareOptionsMenu(Menu menu) { MenuItem register = menu.findItem(R.id.action_forget); @@ -1168,13 +1174,9 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL } else return true; - case R.id.action_forget: { - if(check.getBoolean("checkConv", true)||check.getBoolean("checkPix", true)) { - setVisible(true); - showForget(); + case R.id.action_forget: + showForget(); - } - } case R.id.action_reload: { String url = webView.getUrl(); webView.loadUrl(url); diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 458721dc731c46cc0e1da855468702cb90455610..66ab85d36ba316b17bcaad535684ee57838b7e27 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -17,7 +17,7 @@ <string name="action_state">Stato</string> <string name="action_howto">Manuali</string> - <string name="action_about">A proposito</string> + <string name="action_about">Info</string> <string name="action_exit">Esci</string> <string name="action_share">Condividi</string> <string name="action_reload">Ricarica</string> @@ -29,7 +29,7 @@ <string name="global_ok">OK</string> <string name="more_help">Bisogno di più aiuto?</string> <string name="tell_more">Dimmi di più</string> - <string name="title_activity_about">A proposito</string> + <string name="title_activity_about">Info</string> <string name="MailInfoTitle">Impostazioni Mail</string> <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAutenticazione: Password Normale\n\nSMTP: disroot.org\nSTARTTLS Port 587\nAutenticazione: Password Normale\n\nPOP: disroot.org\nSSL Port 995\nAutenticazione: Password Normale</string> @@ -105,8 +105,8 @@ <string name="state_help">Stato su XMPP</string> <string name="HowToTitle">Info su manuali</string> <string name="HowToInfo">La nostra pagina con manuali e tutorial per aiutarti a orientarti nei vari servizi Disroot.</string> - <string name="AboutTitle">Info a proposito</string> - <string name="AboutInfo">Questa è la pagina a proposito di questa app</string> + <string name="AboutTitle">Info</string> + <string name="AboutInfo">Questa è la pagina Info di questa app</string> <string name="ForumTitle">Aiuto Forum</string> <string name="ForumInfo">Discourse è un approccio moderno e completamente open-source ai forum di discussione. Offre tutto ciò di cui la vostra comunità , gruppo o collettivo ha bisogno per creare la loro piattaforma di comunicazione.</string> <string name="LogoTitle">Hai davvero provato la pressione lunga sul logo?</string> diff --git a/metadata/en b/metadata/en new file mode 120000 index 0000000000000000000000000000000000000000..f2b0341fed0d85a5d78aaea8829f0b92b90e7e6e --- /dev/null +++ b/metadata/en @@ -0,0 +1 @@ +en-US \ No newline at end of file diff --git a/metadata/en-US/featureGraphic.png b/metadata/en-US/featureGraphic.png new file mode 100644 index 0000000000000000000000000000000000000000..5166344db908180f1680d746d742595d0a1ebf3c Binary files /dev/null and b/metadata/en-US/featureGraphic.png differ diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt new file mode 100644 index 0000000000000000000000000000000000000000..cabb36fa1ed6199e630e307096f24b4892bdb14d --- /dev/null +++ b/metadata/en-US/full_description.txt @@ -0,0 +1,22 @@ +<b>Disroot</b> is a platform providing online services based on principles of freedom, privacy, federation and decentralization. +This app is like your Swiss Army knife to the Disroot platform, made by the community for the community. +If you don't have a Disroot account you can still use this app to access all the Disroot services that do not require an account: +* Etherpad +* Ethercalc +* Private bin +* Upload +* Poll +* Searx +* Diaspora* (requires a Diaspora only account) + +The app may require you to install additional apps. We highly recommend you install F-Droid - a free and open source app marketplace - as not all apps can be found on Google's Play Store and F-Droid is more privacy oriented (no tracking, no account needed) you can download it [here](https://f-droid.org/FDroid.apk). + +<b>Supported languages:</b> +* English +* Spanish +* French +* Italian + +<b>Support the project:</b> + ✋ Join discussion on <a href="xmpp:dishub@chat.disroot.org">xmpp:disroot@chat.disroot.org</a> + ✋ Connect with us <a href="https://hub.disroot.org/channel/disroot</a> diff --git a/metadata/en-US/icon.png b/metadata/en-US/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f2aac9bcef4603ef9ddf8ec2fee6a5cf34b00207 Binary files /dev/null and b/metadata/en-US/icon.png differ diff --git a/metadata/en-US/phoneScreenshots/01.png b/metadata/en-US/phoneScreenshots/01.png new file mode 100644 index 0000000000000000000000000000000000000000..76876e5308c7df9d298f00f91681c34152c11ead Binary files /dev/null and b/metadata/en-US/phoneScreenshots/01.png differ diff --git a/metadata/en-US/phoneScreenshots/02.png b/metadata/en-US/phoneScreenshots/02.png new file mode 100644 index 0000000000000000000000000000000000000000..6d121b3fb2e6b91f7627666d711bdc16c9fa63f0 Binary files /dev/null and b/metadata/en-US/phoneScreenshots/02.png differ diff --git a/metadata/en-US/promoGraphic.png b/metadata/en-US/promoGraphic.png new file mode 100644 index 0000000000000000000000000000000000000000..799b47fb2c91565b961433c7f39c038078e3a537 Binary files /dev/null and b/metadata/en-US/promoGraphic.png differ diff --git a/metadata/en-US/short_description.txt b/metadata/en-US/short_description.txt new file mode 100644 index 0000000000000000000000000000000000000000..0bd490a5800c5d0f93693c73aa1a9e28ce36d8d5 --- /dev/null +++ b/metadata/en-US/short_description.txt @@ -0,0 +1 @@ +This app is like your Swiss Army knife to the Disroot platform diff --git a/metadata/en-US/title.txt b/metadata/en-US/title.txt new file mode 100644 index 0000000000000000000000000000000000000000..55296c4c04474e9d99b278643deb9fc3c7c1a6d4 --- /dev/null +++ b/metadata/en-US/title.txt @@ -0,0 +1 @@ +Disroot app