Disroot/disapp
Disroot
/
disapp
8
8
Fork 3
Code Issues 6 Pull Requests 1 Projects Releases 7 Wiki Activity

Fixed about spacing

This commit is contained in:
voryzen 2023-07-20 02:09:15 +10:00
parent d88e711c57
commit 03842e080a
16 changed files with 96 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/disroot/disrootapp/StatusService.java
View File

@ -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);
}

2
app/src/main/java/org/disroot/disrootapp/ui/AboutActivity.java
View File

@ -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);

122
app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
View File

@ -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<String, ?> allEntries = BtnPreference.getAll();
for (Map.Entry<String, ?> 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<Constants.buttonIDs.length; i++) {
Button b = (Button) findViewById(Constants.buttonIDs[i]);
@ -327,13 +327,12 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
}
@Override
public void onClick(View view){
if (firstStart.getBoolean("firsttap", true)){
public void onClick(View view) {
if (firstStart.getBoolean("firsttap", true)) {
showFirstTap();
firstStart.edit().putBoolean("firsttap", false).apply();
return;
}
else {
} else {
switch (view.getId()) {
case R.id.MailBtn:
Intent mail1 = getPackageManager().getLaunchIntentForPackage(Constants.k9);
@ -368,7 +367,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
showCloudDialog();
break;
}
else startActivity(cloud);
else
startActivity(cloud);
break;
case R.id.SocialBtn:
Intent social = getPackageManager().getLaunchIntentForPackage(Constants.Fedilab);
@ -376,7 +376,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
showSocialDialog();
break;
}
else startActivity(social);
else
startActivity(social);
break;
case R.id.ForumBtn:
webView.loadUrl(Constants.URL_DisApp_FORUM);
@ -415,7 +416,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
showPadDialog();
break;
}
else startActivity(pad);
else
startActivity(pad);
break;
case R.id.CryptpadBtn:
webView.loadUrl(Constants.URL_DisApp_CRYPTPAD );
@ -443,7 +445,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
showCallsDialog();
break;
}
else startActivity(calls);
else
startActivity(calls);
break;
case R.id.NotesBtn:
Intent notes = getPackageManager().getLaunchIntentForPackage(Constants.NotesApp);
@ -451,7 +454,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
showNotesDialog();
break;
}
else startActivity(notes);
else
startActivity(notes);
break;
case R.id.GitBtn:
Intent git = getPackageManager().getLaunchIntentForPackage(Constants.GitApp);
@ -459,7 +463,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
showGitDialog();
break;
}
else startActivity(git);
else
startActivity(git);
break;
case R.id.UserBtn:
webView.loadUrl(Constants.URL_DisApp_USER);
@ -716,7 +721,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.MailBtn).getParent()!=null){
if (findViewById( R.id.MailBtn).getParent()!=null) {
viewGroup.removeView(MailBtn);
BtnPreference.edit().putBoolean( "MailBtn", false ).apply();
return;}
@ -725,7 +730,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.show();
}
private void showMailDialog(){
private void showMailDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.DiaInstallTitle);
@ -760,7 +765,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.CloudBtn).getParent()!=null){
if (findViewById( R.id.CloudBtn).getParent()!=null) {
viewGroup.removeView(CloudBtn);
BtnPreference.edit().putBoolean( "CloudBtn", false ).apply();
return;}
@ -768,7 +773,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
});
builder.show();
}
private void showCloudDialog(){
private void showCloudDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.DiaInstallTitle);
@ -799,9 +805,21 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
hideDashboard();
}
});
builder.setNeutralButton( R.string.hide, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.SocialBtn).getParent()!=null) {
viewGroup.removeView(SocialBtn);
BtnPreference.edit().putBoolean( "SocialBtn", false ).apply();
return;
}
}
});
builder.show();
}
private void showSocialDialog(){
private void showSocialDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.DiaInstallTitle);
@ -835,7 +853,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.ForumBtn).getParent()!=null){
if (findViewById( R.id.ForumBtn).getParent()!=null) {
viewGroup.removeView(ForumBtn);
BtnPreference.edit().putBoolean( "ForumBtn", false ).apply();
return;}
@ -907,7 +925,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.ChatBtn).getParent()!=null){
if (findViewById( R.id.ChatBtn).getParent()!=null) {
viewGroup.removeView(ChatBtn);
BtnPreference.edit().putBoolean( "ChatBtn", false ).apply();
return;}
@ -915,7 +933,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
});
builder.show();
}
private void showChatDialog(){
private void showChatDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.DiaInstallTitle);
@ -949,7 +967,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.PadBtn).getParent()!=null){
if (findViewById( R.id.PadBtn).getParent()!=null) {
viewGroup.removeView(PadBtn);
BtnPreference.edit().putBoolean( "PadBtn", false ).apply();
return;}
@ -957,7 +975,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
});
builder.show();
}
private void showPadDialog(){
private void showPadDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.DiaInstallTitle);
@ -991,7 +1009,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.CryptpadBtn ).getParent()!=null){
if (findViewById( R.id.CryptpadBtn ).getParent()!=null) {
viewGroup.removeView( CryptpadBtn );
BtnPreference.edit().putBoolean( "CryptpadBtn", false ).apply();
return;}
@ -1017,7 +1035,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.BinBtn).getParent()!=null){
if (findViewById( R.id.BinBtn).getParent()!=null) {
viewGroup.removeView(BinBtn);
BtnPreference.edit().putBoolean( "BinBtn", false ).apply();
return;}
@ -1044,7 +1062,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.UploadBtn).getParent()!=null){
if (findViewById( R.id.UploadBtn).getParent()!=null) {
viewGroup.removeView(UploadBtn);
BtnPreference.edit().putBoolean( "UploadBtn", false ).apply();
return;}
@ -1070,7 +1088,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.SearxBtn).getParent()!=null){
if (findViewById( R.id.SearxBtn).getParent()!=null) {
viewGroup.removeView(SearxBtn);
BtnPreference.edit().putBoolean( "SearxBtn", false ).apply();
return;}
@ -1097,7 +1115,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.BoardBtn).getParent()!=null){
if (findViewById( R.id.BoardBtn).getParent()!=null) {
viewGroup.removeView(BoardBtn);
BtnPreference.edit().putBoolean( "BoardBtn", false ).apply();
return;}
@ -1106,7 +1124,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
builder.show();
}*/
private void showCallsDialog(){
private void showCallsDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.DiaInstallTitle);
@ -1140,7 +1158,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.CallsBtn).getParent()!=null){
if (findViewById( R.id.CallsBtn).getParent()!=null) {
viewGroup.removeView(CallsBtn);
BtnPreference.edit().putBoolean( "CallsBtn", false ).apply();
return;}
@ -1167,7 +1185,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.NotesBtn).getParent()!=null){
if (findViewById( R.id.NotesBtn).getParent()!=null) {
viewGroup.removeView(NotesBtn);
BtnPreference.edit().putBoolean( "NotesBtn", false ).apply();
return;}
@ -1175,7 +1193,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
});
builder.show();
}
private void showNotesDialog(){
private void showNotesDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.DiaInstallTitle);
@ -1209,7 +1227,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.GitBtn).getParent()!=null){
if (findViewById( R.id.GitBtn).getParent()!=null) {
viewGroup.removeView(GitBtn);
BtnPreference.edit().putBoolean( "GitBtn", false ).apply();
return;}
@ -1217,7 +1235,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
});
builder.show();
}
private void showGitDialog(){
private void showGitDialog() {
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
builder.setCancelable(false);
builder.setTitle(R.string.DiaInstallTitle);
@ -1245,7 +1263,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.UserBtn).getParent()!=null){
if (findViewById( R.id.UserBtn).getParent()!=null) {
viewGroup.removeView(UserBtn);
BtnPreference.edit().putBoolean( "UserBtn", false ).apply();
return;}
@ -1325,7 +1343,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.HowToBtn).getParent()!=null){
if (findViewById( R.id.HowToBtn).getParent()!=null) {
viewGroup.removeView(HowToBtn);
BtnPreference.edit().putBoolean( "HowToBtn", false ).apply();
return;}
@ -1344,7 +1362,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
@Override
public void onClick(DialogInterface dialog, int which) {
ViewGroup viewGroup =((ViewGroup)findViewById( R.id.StateBtn ).getParent());
if (findViewById( R.id.AboutBtn).getParent()!=null){
if (findViewById( R.id.AboutBtn).getParent()!=null) {
viewGroup.removeView(AboutBtn);
BtnPreference.edit().putBoolean( "AboutBtn", false ).apply();
return;}
@ -1374,7 +1392,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
if (Counter < 10)
Counter++;
//first time tap check
if ((Counter == 10 )){
if ((Counter == 10 )) {
Intent goTap = new Intent(MainActivity.this, wsdfhjxc.taponium.MainActivity.class);
MainActivity.this.startActivity(goTap);
dialog.dismiss();
@ -1520,7 +1538,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
shareCurrentPage();
return true;
/*case R.id.action_home:
if(webView.getVisibility()==View.VISIBLE){
if(webView.getVisibility()==View.VISIBLE) {
//animation
animateup.setDuration(500);
animateup.setFillAfter(false);
@ -1530,7 +1548,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
return true;
}
if (webView.getVisibility()==View.GONE && webView.getUrl()!=null){
if (webView.getVisibility()==View.GONE && webView.getUrl()!=null) {
//animation
animatedown.setDuration(500);
animatedown.setFillAfter(false);
@ -1560,9 +1578,9 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
MainActivity.this.startActivity(goBtnSettings);
return true;
case R.id.action_clear_cookies: {
if(Build.VERSION.SDK_INT >= 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<Uri[]> filePath){
void openChooser(ValueCallback<Uri[]> 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<String, String> hashmap= (HashMap<String, String>) 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";

5
app/src/main/java/org/disroot/disrootapp/ui/StateActivity.java
View File

@ -128,11 +128,10 @@ public class StateActivity extends AppCompatActivity {
for (int i = 0; i < data.length(); i++) {
JSONObject c = data.getJSONObject(i);
HashMap<String, String> 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");
}

4
app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java
View File

@ -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

6
app/src/main/res/layout/activity_welcome.xml
View File

@ -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">
<ImageButton
android:id="@+id/fDroidBtn"
@ -66,7 +67,8 @@
android:layout_height="48dp"
android:background="@color/bg_primary_blue"
android:foreground="@drawable/ic_home"
android:contentDescription="@string/app_name" /></LinearLayout>
android:contentDescription="@string/app_name" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

5
app/src/main/res/layout/fragment_about_help.xml
View File

@ -169,14 +169,15 @@
style="@android:style/TextAppearance.DeviceDefault.Large"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/SpreadTheWord"
android:layout_marginBottom="8dp"/>
android:layout_marginBottom="16dp"
android:text="@string/SpreadTheWord"/>
<TextView
android:id="@+id/fragment_about__spread_the_word_text"
android:textAppearance="@style/TextAppearance.AppCompat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/SpreadTheWordTxt"/>
<!--<Button

2
app/src/main/res/layout/fragment_about_license.xml
View File

@ -59,6 +59,7 @@
android:id="@+id/disrootUrl"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/disrootUrl"
android:textColor="@color/bg_primary_blue_dark"
android:clickable="true"
@ -221,6 +222,7 @@
android:textAppearance="@style/TextAppearance.AppCompat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/thirdPartyText"/>
</LinearLayout>

1
app/src/main/res/values-de/strings.xml
View File

@ -26,6 +26,7 @@
<string name="CloudInfoTitle">Nextcloud Einstellungen</string>
<string name="CloudInfo">Sichere und synchronisiere Deine Daten. Mit Nextcloud kannst du Dateien, Kalender, Kontakte und mehr mit Anderen teilen.\n\nHost:\n https://cloud.disroot.org\n\nBenutzername:\n "dein Disroot Benutzername"\n\nPasswort:\n "dein Disroot Passwort".</string>
<string name="WelcomeTitle">Willkommen</string>
<!-- needs translation check (has Diaspora in the translation) -->
<string name="WelcomeInfo">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 \ \ \ &#8226; Etherpad\n \ \ \ &#8226; Cryptpad\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Searx\n \ \ \ &#8226; 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</string>
<string name="help">Hilfe</string>
<string name="license">Lizenz</string>

3
app/src/main/res/values-es/strings.xml
View File

@ -30,9 +30,8 @@
<string name="CloudInfoTitle">Configuración de Nextcloud:</string>
<string name="CloudInfo">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.</string>
<string name="WelcomeTitle">Bienvenidx</string>
<!-- needs translation check (has Diaspora in the translation) -->
<string name="WelcomeInfo">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</string>
<string name="help">Ayuda</string>
<string name="license">Licencia</string>
<string name="action_settings">Configuraciones</string>

2
app/src/main/res/values-fr/strings.xml
View File

@ -57,8 +57,8 @@
\nMot de passe :
\n votre_mot_de_passe_disroot.</string>
<string name="WelcomeTitle">Bienvenue</string>
<!-- needs translation check (has Diaspora in the translation) -->
<string name="WelcomeInfo">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</string>
<string name="help">Aide</string>
<string name="license">Licence d\'utilisation</string>
<string name="action_settings">Paramètres</string>

1
app/src/main/res/values-it/strings.xml
View File

@ -26,6 +26,7 @@
<string name="CloudInfoTitle">Impostazioni Nextcloud</string>
<string name="CloudInfo">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</string>
<string name="WelcomeTitle">Benvenuto</string>
<!-- needs translation check (has Diaspora in the translation) -->
<string name="WelcomeInfo">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 \ \ \ &#8226; Etherpad\n \ \ \ &#8226; Cryptpad\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Searx\n \ \ \ &#8226; 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</string>
<string name="help">Aiuto</string>
<string name="license">Licenza</string>

2
app/src/main/res/values-nl/strings.xml
View File

@ -30,8 +30,8 @@
<string name="CloudInfoTitle">Nextcloud Instellingen</string>
<string name="CloudInfo">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.</string>
<string name="WelcomeTitle">Welkom</string>
<!-- needs translation check (has Diaspora in the translation) -->
<string name="WelcomeInfo">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 \ \ \ &#8226; Cryptpad\n \ \ \ &#8226; Cryptpad\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Searx\n \ \ \ &#8226; 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</string>
<string name="help">Help</string>
<string name="license">Licentie</string>
<string name="action_settings">Instellingen</string>

3
app/src/main/res/values-pt/strings.xml
View File

@ -30,8 +30,9 @@
<string name="CloudInfoTitle">Definições Nextcloud</string>
<string name="CloudInfo">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.</string>
<string name="WelcomeTitle">Bem Vindo</string>
<!-- needs translation check (has Diaspora in the translation) -->
<!-- NOTE: pt-BR does not contain any welcome strings. Please check -->
<string name="WelcomeInfo">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 \ \ \ &#8226; Cryptpad\n \ \ \ &#8226; Cryptpad\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Searx\n \ \ \ &#8226; 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</string>
<string name="help">Ajuda</string>
<string name="license">Licença</string>
<string name="action_settings">Definições</string>

2
app/src/main/res/values-sr/strings.xml
View File

@ -30,8 +30,8 @@
<string name="CloudInfoTitle">Nextcloud podešavanja</string>
<string name="CloudInfo">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.</string>
<string name="WelcomeTitle">Dobro došli</string>
<!-- needs translation check (has Diaspora in the translation) -->
<string name="WelcomeInfo">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 \ \ \ &#8226; Cryptpad\n \ \ \ &#8226; Cryptpad\n \ \ \ &#8226; PrivateBin\n \ \ \ &#8226; Otpremi\n \ \ \ &#8226; Searx\n \ \ \ &#8226; 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</string>
<string name="help">Pomoć</string>
<string name="license">Licenca</string>
<string name="action_settings">Podešavanja</string>

2
app/src/main/res/xml/changelog_master.xml
View File

@ -2,7 +2,7 @@
<changelog>
<release version="2.0.8" versioncode="31" >
<change>Added Akkoma</change>
<change>Added Jitsi</change>
<change>Fixed some code decrepancies with Jitsi</change>
<change>General Information Update</change>
</release>
<release version="2.0.7" versioncode="30" >