Disroot/disapp
9
11
Fork 3
Code Issues 6 Pull requests Projects Releases 7 Wiki Activity

Fixed state layout+grey dot, share function and simplified contributors

Browse source
This commit is contained in:
massimiliano 2020-01-19 21:30:06 +01:00
parent 5b52be3670
commit 47bc50447c
18 changed files with 204 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/src/main/java/org/disroot/disrootapp/ui/AboutActivity.java
View file

@ -14,6 +14,7 @@ import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
import android.view.Menu;
@ -26,6 +27,7 @@ import android.widget.TextView;
import org.disroot.disrootapp.R;
import org.disroot.disrootapp.utils.Constants;
import org.disroot.disrootapp.utils.Contributors;
import static org.disroot.disrootapp.BuildConfig.APPLICATION_ID;
import static org.disroot.disrootapp.BuildConfig.VERSION_CODE;
@ -225,6 +227,44 @@ public class AboutActivity extends AppCompatActivity {
break;
case 3:
rootView = inflater.inflate(R.layout.fragment_about_license, container, false);
//Contributors
//Admins
final TextView contr_text;
contr_text = rootView.findViewById(R.id.admins_text);
contr_text.setMovementMethod( LinkMovementMethod.getInstance());
String admins="";
for(String admin: Contributors.admins) {
admins+="&bull; "+admin+"</a><br>";
contr_text.setText( Html.fromHtml(admins));
}
//devs
final TextView devs_text;
devs_text = rootView.findViewById(R.id.devs_text);
devs_text.setMovementMethod( LinkMovementMethod.getInstance());
String devs="";
for(String dev: Contributors.devs) {
devs+="&bull; "+dev+"</a><br>";
devs_text.setText( Html.fromHtml(devs));
}
//translators
final TextView translators_text;
translators_text = rootView.findViewById(R.id.translators_text);
translators_text.setMovementMethod( LinkMovementMethod.getInstance());
String translators="";
for(String translator: Contributors.translators) {
translators+="&bull; "+translator+"</a><br>";
translators_text.setText( Html.fromHtml(translators));
}
//artworks
final TextView artworks_text;
artworks_text = rootView.findViewById(R.id.artworks_text);
artworks_text.setMovementMethod( LinkMovementMethod.getInstance());
String artworks="";
for(String artwork: Contributors.artworks) {
artworks+="&bull; "+artwork+"</a><br>";
artworks_text.setText( Html.fromHtml(artworks));
}
//Buttons
final Button licenseBtn;//LicenseBtn
licenseBtn = rootView.findViewById(R.id.license_button);

4
app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
View file

@ -1314,9 +1314,11 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
public void shareCurrentPage() {
ScrollView dashboard = findViewById(R.id.dashboard);
Intent intent = new Intent(Intent.ACTION_SEND);
intent.setAction(Intent.ACTION_SEND);
intent.putExtra(Intent.EXTRA_TEXT, webView.getUrl());
if (dashboard.getVisibility() == View.GONE) intent.putExtra( Intent.EXTRA_TEXT, webView.getUrl() );
else intent.putExtra( Intent.EXTRA_TEXT, Constants.URL_DisApp_DISAPP );
intent.setType("text/plain");
startActivity(intent);
}

3
app/src/main/java/org/disroot/disrootapp/utils/Constants.java
View file

@ -51,7 +51,8 @@ public class Constants {
public static final String URL_DisApp_BOARDHELP = "https://howto.disroot.org/en/tutorials/project_board";
public static final String URL_DisApp_NOTESHELP = "https://howto.disroot.org/en/tutorials/cloud/clients/mobile/android/using-notes";
public static final String URL_DisApp_CALLSHELP = "https://disroot.org/en/services/calls";
public static final String URL_DisApp_GITHELP = "https://howto.disroot.org/en/contribute/git";//need url
public static final String URL_DisApp_GITHELP = "https://howto.disroot.org/en/contribute/git";
public static final String URL_DisApp_DISAPP = "https://f-droid.org/en/packages/org.disroot.disrootapp/";
public static final String k9 = "com.fsck.k9";
public static final String nc = "com.nextcloud.client";

24
app/src/main/java/org/disroot/disrootapp/utils/Contributors.java Normal file
View file

@ -0,0 +1,24 @@
package org.disroot.disrootapp.utils;
/**
* Created by jackson on 02/11/15.
*/
public class Contributors {
public static final String[] admins= {
"<a href='https://hub.disroot.org/channel/muppeth'>Muppeth",
"<a href='https://hub.disroot.org/channel/antilopa'>Antilopa"
};
public static final String[] devs= {
"<a href='https://hub.disroot.org/channel/massimiliano'>Massimiliano"
};
public static final String[] translators= {
"Fede",
"Meaz",
"maryjane",
"userdebug",
"jh"
};
public static final String[] artworks= {
"<a href='https://hub.disroot.org/channel/antilopa'>Antilopa"
};
}

2
app/src/main/res/drawable/ic_logo.xml
View file

@ -53,7 +53,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="1.0666666"
android:fillColor="#808080"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>

2
app/src/main/res/layout/activity_main.xml
View file

@ -14,7 +14,7 @@
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="10dp"
android:progressTint="@color/dark_grey"
android:progressTint="@color/bg_primary_blue_dark"
android:visibility="gone"
android:indeterminate="false"
android:max="100"

35
app/src/main/res/layout/activity_state.xml
View file

@ -3,53 +3,52 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/dark_grey"
android:gravity="center"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
tools:context=".ui.StateActivity">
<include layout="@layout/item_toolbar" />
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center|top"
android:background="@color/dark_grey">
android:orientation="horizontal">
<Button
android:id="@+id/StateBtn"
android:shadowColor="@color/bg_primary_blue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="120dp"
android:width="128dp"
android:layout_gravity="fill"
android:breakStrategy="simple"
android:minLines="3"
android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
android:minLines="2"
android:drawableTop="@drawable/ic_state"
android:drawableTint="@color/gray"
android:text="@string/state_btn"
android:layout_gravity="center"
android:layout_marginRight="30dp"
style="?android:attr/borderlessButtonStyle"
android:textColor="@color/gray"/>
<Button
android:id="@+id/StateMessageBtn"
android:shadowColor="@color/bg_primary_blue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="120dp"
android:width="128dp"
android:layout_gravity="fill"
android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
android:breakStrategy="simple"
android:minLines="3"
android:minLines="2"
android:drawableTop="@drawable/ic_state"
android:text="@string/state_messages_btn"
android:layout_gravity="center"
android:layout_marginLeft="30dp"
style="?android:attr/borderlessButtonStyle"
android:textColor="#ffffff"/>
</android.support.v7.widget.LinearLayoutCompat>
android:textColor="@color/white"/>
</LinearLayout>
<ListView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/dark_grey"/>
android:layout_height="wrap_content"/>
</LinearLayout>

65
app/src/main/res/layout/activity_state_messages.xml
View file

@ -3,48 +3,47 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/dark_grey"
android:gravity="center"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
tools:context=".ui.StateActivity">
<include layout="@layout/item_toolbar" />
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:background="@color/dark_grey">
<Button
android:id="@+id/StateBtn"
android:shadowColor="@color/bg_primary_blue"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="120dp"
android:breakStrategy="simple"
android:minLines="3"
android:drawableTop="@drawable/ic_state"
android:text="@string/state_btn"
android:layout_gravity="center"
android:layout_marginRight="24dp"
style="?android:attr/borderlessButtonStyle"
android:textColor="#ffffff"/>
<Button
android:id="@+id/StateMessageBtn"
android:shadowColor="@color/bg_primary_blue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="120dp"
android:breakStrategy="simple"
android:minLines="3"
android:drawableTop="@drawable/ic_state"
android:drawableTint="@color/gray"
android:text="@string/state_messages_btn"
android:layout_gravity="center"
android:layout_marginLeft="24dp"
style="?android:attr/borderlessButtonStyle"
android:textColor="@color/gray"/>
</android.support.v7.widget.LinearLayoutCompat>
android:orientation="horizontal">
<Button
android:id="@+id/StateBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:width="128dp"
android:layout_gravity="fill"
android:breakStrategy="simple"
android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
android:minLines="2"
android:drawableTop="@drawable/ic_state"
android:text="@string/state_btn"
style="?android:attr/borderlessButtonStyle"
android:textColor="@color/white"/>
<Button
android:id="@+id/StateMessageBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:width="128dp"
android:layout_gravity="fill"
android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
android:breakStrategy="simple"
android:minLines="2"
android:drawableTop="@drawable/ic_state"
android:drawableTint="@color/gray"
android:text="@string/state_messages_btn"
style="?android:attr/borderlessButtonStyle"
android:textColor="@color/gray"/>
</LinearLayout>
<ListView
android:id="@+id/list"

51
app/src/main/res/layout/fragment_about_license.xml
View file

@ -86,19 +86,60 @@
android:orientation="vertical">
<TextView
android:id="@+id/contibutors"
android:id="@+id/admins"
style="@android:style/TextAppearance.DeviceDefault.Large"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/contributorsTitle" />
android:text="@string/adminsTitle" />
<TextView
android:id="@+id/mastext"
android:id="@+id/admins_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/contributors" />
android:text="" />
<TextView
android:id="@+id/devs"
style="@android:style/TextAppearance.DeviceDefault.Large"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/devsTitle" />
<TextView
android:id="@+id/devs_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="" />
<TextView
android:id="@+id/translators"
style="@android:style/TextAppearance.DeviceDefault.Large"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/translatorsTitle" />
<TextView
android:id="@+id/translators_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="" />
<TextView
android:id="@+id/artworks"
style="@android:style/TextAppearance.DeviceDefault.Large"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/artworksTitle" />
<TextView
android:id="@+id/artworks_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="" />
</LinearLayout>
</android.support.v7.widget.CardView>
<!-- License -->

7
app/src/main/res/values-de/strings.xml
View file

@ -53,7 +53,6 @@
<string name="maintainersText">Diese App wird zur Zeit gepflegt und entwickelt von\n\n</string>
<string name="disrootUrl">https://disroot.org</string>
<string name="disroot"> * Disroot Community (Disroot):</string>
<string name="contributorsTitle">Mitwirkende</string>
<string name="contributors"><b> &#8226; muppeth:</b>\n Disroot Administrator\n\n<b> &#8226; antilopa:</b>\n Disroot Administrator\n\n<b> &#8226; Massimiliano:</b>\n Entwickler\n\n<b> &#8226; Fede:</b>\n Verfasser von Inhalten\n\n<b> &#8226; Meaz:</b>\n Verfasser von Inhalten\n\n<b> &#8226; maryjane:</b>\n Verfasser von Inhalten\n\n<b> &#8226; userdebug:</b>\n Verfasser von Inhalten\n\n<b> &#8226; jh:</b>\n Verfasser von Inhalten\n\n</string>
<string name="fDroid">F-Droid</string>
<string name="thirdparty">Libraries von Drittanbietern</string>
@ -204,9 +203,7 @@
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<string name="MailBtnPref">show/hide Mail icon</string>
<string name="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
@ -217,5 +214,9 @@
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
<string name="adminsTitle">Admins:</string>
<string name="devsTitle">Developers:</string>
<string name="translatorsTitle">Translators:</string>
<string name="artworksTitle">Artwork:</string>
</resources>

7
app/src/main/res/values-es/strings.xml
View file

@ -53,7 +53,6 @@
<string name="maintainersText">Actualmente, esta aplicación está siendo desarrollada y mantenida por\n\n</string>
<string name="disrootUrl"><a href = "https://disroot.org">https://disroot.org</a></string>
<string name="disroot"> * Comunidad de Disroot (Disroot):</string>
<string name="contributorsTitle">Colaboradores</string>
<string name="contributors"><b> &#8226; muppeth:</b>\n administrador Disroot\n\n<b> &#8226; antilopa:</b>\n administradora Disroot\n\n<b> &#8226; Massimiliano:</b>\n Desarrollador\n\n<b> &#8226; Fede:</b>\n Contribuyente de contenido\n\n<b> &#8226; Meaz:</b>\n Contribuyente de contenido\n\n<b> &#8226; maryjane:</b>\n Contribuyente de contenido\n\n<b> &#8226; userdebug:</b>\n Contribuyente de contenido\n\n<b> &#8226; ButterflyOfFire:</b>\n Contribuyente de contenido\n\n<b> &#8226; jh:</b>\n Contribuyente de contenido\n\n<b> &#8226; Shadowsword:</b>\n Contribuyente de contenido\n\n</string>
<string name="fDroid">F-Droid</string>
<string name="thirdparty">Librerías de Terceros</string>
@ -165,9 +164,7 @@
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<string name="MailBtnPref">show/hide Mail icon</string>
<string name="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
@ -178,4 +175,8 @@
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
<string name="adminsTitle">Admins:</string>
<string name="devsTitle">Developers:</string>
<string name="translatorsTitle">Translators:</string>
<string name="artworksTitle">Artwork:</string>
</resources>

7
app/src/main/res/values-fr/strings.xml
View file

@ -75,7 +75,6 @@
<string name="maintainersText">Cette application est actuellement développée et maintenue par\n\n</string>
<string name="disrootUrl">https://disroot.org</string>
<string name="disroot">* La communauté Disroot (Disroot) :</string>
<string name="contributorsTitle">Contributeurs</string>
<string name="contributors"><b> • muppeth:</b>\n Administrateur Disroot\n\n<b> • antilopa:</b>\n Administrateur Disroot\n\n<b> • Massimiliano:</b>\n Développeur actuel de l\'application Disroot\n\n<b> • Fede, Meaz, maryjane, userdebug, ButterflyOfFire, jh:</b>\n Contributeurs de contenu\n\n</string>
<string name="fDroid">F-Droid</string>
<string name="thirdparty">Librairies tierces</string>
@ -202,9 +201,7 @@
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<string name="MailBtnPref">show/hide Mail icon</string>
<string name="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
@ -215,4 +212,8 @@
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
<string name="adminsTitle">Admins:</string>
<string name="devsTitle">Developers:</string>
<string name="translatorsTitle">Translators:</string>
<string name="artworksTitle">Artwork:</string>
</resources>

7
app/src/main/res/values-it/strings.xml
View file

@ -52,7 +52,6 @@
<string name="maintainersText">Questa app è attualmente in fase di sviluppo e manutenuta da parte di\n\n</string>
<string name="disrootUrl">https://disroot.org</string>
<string name="disroot"> * Comunità Disroot (Disroot):</string>
<string name="contributorsTitle">Contribuenti</string>
<string name="contributors"><b> &#8226; muppeth:</b>\n Amministratore Disroot\n\n<b> &#8226; antilopa:</b>\n Amministratrice Disroot\n\n<b> &#8226; Massimiliano:</b>\n Sviluppatore\n\n<b> &#8226; Fede:</b>\n Contributore di contenuti\n\n<b> &#8226; Meaz:</b>\n Contributore di contenuti\n\n<b> &#8226; maryjane:</b>\n Contributore di contenuti\n\n<b> &#8226; userdebug:</b>\n Contributore di contenuti\n\n<b> &#8226; ButterflyOfFire:</b>\n Contributore di contenuti\n\n<b> &#8226; jh:</b>\n Contributore di contenuti\n\n</string>
<string name="fDroid">F-Droid</string>
<string name="thirdparty">Librerie di terze parti</string>
@ -164,9 +163,7 @@
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<string name="MailBtnPref">show/hide Mail icon</string>
<string name="settings">Impostazioni</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
@ -177,4 +174,8 @@
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
<string name="adminsTitle">Admins:</string>
<string name="devsTitle">Developers:</string>
<string name="translatorsTitle">Translators:</string>
<string name="artworksTitle">Artwork:</string>
</resources>

7
app/src/main/res/values-nl/strings.xml
View file

@ -53,7 +53,6 @@
<string name="maintainersText">Deze app wordt momenteel ontwikkeld en onderhouden door\n\n</string>
<string name="disrootUrl">https://disroot.org</string>
<string name="disroot"> * Disroot Gemeenschap (Disroot):</string>
<string name="contributorsTitle">Bijdragers</string>
<string name="contributors"><b> &#8226; muppeth:</b>\n Disroot administrator\n\n<b> &#8226; antilopa:</b>\n Disroot administrator\n\n<b> &#8226; Massimiliano:</b>\n Ontwikkelaar\n\n<b> &#8226; Fede:</b>\n Inhoud bijdrager\n\n<b> &#8226; Meaz:</b>\n Inhoud bijdrager\n\n<b> &#8226; maryjane:</b>\n Inhoud bijdrager\n\n<b> &#8226; userdebug:</b>\n Inhoud bijdrager\n\n<b> &#8226; ButterflyOfFire:</b>\n Inhoud bijdrager\n\n</string>
<string name="fDroid">F-Droid</string>
<string name="thirdparty">Third-Party Libraries</string>
@ -166,9 +165,7 @@
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<string name="MailBtnPref">show/hide Mail icon</string>
<string name="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
@ -179,4 +176,8 @@
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
<string name="adminsTitle">Admins:</string>
<string name="devsTitle">Developers:</string>
<string name="translatorsTitle">Translators:</string>
<string name="artworksTitle">Artwork:</string>
</resources>

7
app/src/main/res/values-pt/strings.xml
View file

@ -52,7 +52,6 @@
<string name="maintainersText">Esta aplicação é desenvolvida e mantida por\n\n</string>
<string name="disrootUrl">https://disroot.org</string>
<string name="disroot"> * Disroot Community (Disroot):</string>
<string name="contributorsTitle">Contributors</string>
<string name="contributors"><b> &#8226; muppeth:</b>\n Disroot admin\n\n<b> &#8226; antilopa:</b>\n Disroot admin\n\n<b> &#8226; Massimiliano:</b>\n Current developer of the Disroot app\n\n<b> &#8226; Fede:</b>\n Content contributor\n\n<b> &#8226; Meaz:</b>\n Content contributor\n\n<b> &#8226; maryjane:</b>\n Content contributor\n\n<b> &#8226; userdebug:</b>\n Content contributor\n\n<b> &#8226; ButterflyOfFire:</b>\n Content contributor\n\n<b> &#8226; jh:</b>\n Content contributor\n\n</string>
<string name="fDroid">F-Droid</string>
<string name="thirdparty">Bibliotecas de Terceiros</string>
@ -164,9 +163,7 @@
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<string name="MailBtnPref">Mail</string>
<string name="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
@ -177,4 +174,8 @@
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
<string name="adminsTitle">Admins:</string>
<string name="devsTitle">Developers:</string>
<string name="translatorsTitle">Translators:</string>
<string name="artworksTitle">Artwork:</string>
</resources>

7
app/src/main/res/values-sr/strings.xml
View file

@ -53,7 +53,6 @@
<string name="maintainersText">Aplikaciju trenutno razvija i održava\n\n</string>
<string name="disrootUrl">https://disroot.org</string>
<string name="disroot"> * Disroot zajednica (Disroot):</string>
<string name="contributorsTitle">Saradnici</string>
<string name="contributors"><b> &#8226; muppeth:</b>\n Disroot administrator\n\n<b> &#8226; antilopa:</b>\n Disroot administrator\n\n<b> &#8226; Massimiliano:</b>\n programer\n\n<b> &#8226; Fede:</b>\n saradnik\n\n<b> &#8226; Meaz:</b>\n saradnik\n\n<b> &#8226; maryjane:</b>\n saradnik\n\n<b> &#8226; userdebug:</b>\n saradnik\n\n<b> &#8226; ButterflyOfFire:</b>\n saradnik\n\n<b> &#8226; jh:</b>\n saradnik\n\n</string>
<string name="fDroid">F-Droid</string>
<string name="thirdparty">Biblioteke treće strane</string>
@ -165,9 +164,7 @@
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<string name="MailBtnPref">show/hide Mail icon</string>
<string name="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
@ -178,4 +175,8 @@
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
<string name="adminsTitle">Admins:</string>
<string name="devsTitle">Developers:</string>
<string name="translatorsTitle">Translators:</string>
<string name="artworksTitle">Artwork:</string>
</resources>

17
app/src/main/res/values/strings.xml
View file

@ -13,7 +13,6 @@
<string name="action_searx">Search</string>
<string name="action_poll">Polls</string>
<string name="action_board">Project board</string>
<string name="action_user">Account</string>
<string name="action_state">State</string>
<string name="action_howto">How to</string>
@ -35,8 +34,6 @@
<string name="CloudInfoTitle">Nextcloud Settings</string>
<string name="CloudInfo">Keep your data synchronized and safe. With Nextcloud you can share your files, calendars, contacts and more.\n\nHost:\n https://cloud.disroot.org\n\nUsername:\n your_disroot_username\n\nPassword:\n your_disroot_password.</string>
<string name="WelcomeTitle">Welcome</string>
<string name="WelcomeInfo">Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.\nThis app is like your Swiss Army knife to the Disroot platform, made by the community for the community.\nIf 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:\n \ \ \ &#8226; Etherpad\n \ \ \ &#8226; Ethercalc\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Poll\n \ \ \ &#8226; Searx\n \ \ \ &#8226; Diaspora* (requires a Diaspora only account)\n\nThe 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 by tapping on the F-droid icon.\n</string>
<string name="help">Help</string>
<string name="license">License</string>
<string name="action_settings">Settings</string>
@ -52,7 +49,6 @@
<string name="maintainersText">This app is currently being developed and maintained by\n\n</string>
<string name="disrootUrl">https://disroot.org</string>
<string name="disroot"> * Disroot Community (Disroot):</string>
<string name="contributorsTitle">Contributors</string>
<string name="contributors"><b> &#8226; muppeth:</b>\n Disroot admin\n\n<b> &#8226; antilopa:</b>\n Disroot admin\n\n<b> &#8226; Massimiliano:</b>\n Developer\n\n<b> &#8226; Fede:</b>\n Content contributor\n\n<b> &#8226; Meaz:</b>\n Content contributor\n\n<b> &#8226; maryjane:</b>\n Content contributor\n\n<b> &#8226; userdebug:</b>\n Content contributor\n\n<b> &#8226; jh:</b>\n Content contributor\n\n</string>
<string name="fDroid">F-Droid</string>
<string name="thirdparty">Third-Party Libraries</string>
@ -159,15 +155,18 @@
<string name="do_you_want_to_exit">Do you want to exit?</string>
<string name="action_optimization">Battery optimization</string>
<string name="OptimizationTitle">Battery optimization!</string>
<string name="OptimizationInfo">With this update the app can sync with the status page of Disroot. This means you will receive realtime updates on issues, downtimes, scheduled maintenace and others published via https://state.disroot.org\nWe recommend to turn off battery optimization and allow Disroot app to run in background. If you\'re not sure, you can always change the setting from the menu of the Disroot app later.</string>
<string name="OptimizationInfo">The Disroot app can sync with the status page of Disroot. This means you will receive realtime updates on issues, downtimes, scheduled maintenace and others published via https://state.disroot.org\nWe recommend to turn off battery optimization and allow Disroot app to run in background. If you\'re not sure, you can always change the setting from the menu of the Disroot app later.</string>
<string name="action_user">Account</string>
<string name="id">id:</string>
<string name="version">App version:</string>
<string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</string>
<string name="MailBtnPref">Mail</string>
<string name="settings">Settings</string>
<string name="CloudBtnPref">Cloud</string>
<string name="WelcomeInfo">Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.\nThis app is like your Swiss Army knife to the Disroot platform, made by the community for the community.\nIf 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:\n \ \ \ &#8226; Etherpad\n \ \ \ &#8226; Ethercalc\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Poll\n \ \ \ &#8226; Searx\n \ \ \ &#8226; Calls\n\nThe 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 by tapping on the F-droid icon.\n</string>
<string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string>
@ -178,4 +177,8 @@
<string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea.\n A painless, self-hosted Git service</string>
<string name="GitsDialog">To continue you need to install GitNex first.\nPlease select install to continue with the installation on F-Droid.</string>
<string name="adminsTitle">Admins:</string>
<string name="devsTitle">Developers:</string>
<string name="translatorsTitle">Translators:</string>
<string name="artworksTitle">Artwork:</string>
</resources>

1
app/src/main/res/values/styles.xml
View file

@ -22,7 +22,6 @@
<item name="android:paddingRight">@dimen/activity_horizontal_margin</item>
</style>
<style name="Widget.MyApp.ActionBar" parent="Widget.AppCompat.ActionBar">
<item name="theme">@style/ThemeOverlay.MyApp.ActionBar</item>
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item> <!--change theme for actionbar poupmenu-->