Commit 47bc5044 authored by Massimiliano's avatar Massimiliano
Browse files

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

parent 5b52be36
...@@ -14,6 +14,7 @@ import android.support.v4.app.FragmentPagerAdapter; ...@@ -14,6 +14,7 @@ import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.text.Html;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
...@@ -26,6 +27,7 @@ import android.widget.TextView; ...@@ -26,6 +27,7 @@ import android.widget.TextView;
import org.disroot.disrootapp.R; import org.disroot.disrootapp.R;
import org.disroot.disrootapp.utils.Constants; 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.APPLICATION_ID;
import static org.disroot.disrootapp.BuildConfig.VERSION_CODE; import static org.disroot.disrootapp.BuildConfig.VERSION_CODE;
...@@ -225,6 +227,44 @@ public class AboutActivity extends AppCompatActivity { ...@@ -225,6 +227,44 @@ public class AboutActivity extends AppCompatActivity {
break; break;
case 3: case 3:
rootView = inflater.inflate(R.layout.fragment_about_license, container, false); 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 //Buttons
final Button licenseBtn;//LicenseBtn final Button licenseBtn;//LicenseBtn
licenseBtn = rootView.findViewById(R.id.license_button); licenseBtn = rootView.findViewById(R.id.license_button);
......
...@@ -1314,9 +1314,11 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL ...@@ -1314,9 +1314,11 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
public void shareCurrentPage() { public void shareCurrentPage() {
ScrollView dashboard = findViewById(R.id.dashboard);
Intent intent = new Intent(Intent.ACTION_SEND); Intent intent = new Intent(Intent.ACTION_SEND);
intent.setAction(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"); intent.setType("text/plain");
startActivity(intent); startActivity(intent);
} }
......
...@@ -51,7 +51,8 @@ public class Constants { ...@@ -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_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_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_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 k9 = "com.fsck.k9";
public static final String nc = "com.nextcloud.client"; public static final String nc = "com.nextcloud.client";
......
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"
};
}
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
android:strokeAlpha="1" android:strokeAlpha="1"
android:strokeLineJoin="miter" android:strokeLineJoin="miter"
android:strokeWidth="1.0666666" android:strokeWidth="1.0666666"
android:fillColor="#808080" android:fillColor="#ffffff"
android:strokeColor="#00000000" android:strokeColor="#00000000"
android:fillAlpha="1" android:fillAlpha="1"
android:strokeLineCap="butt"/> android:strokeLineCap="butt"/>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
style="@android:style/Widget.ProgressBar.Horizontal" style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="10dp" android:layout_height="10dp"
android:progressTint="@color/dark_grey" android:progressTint="@color/bg_primary_blue_dark"
android:visibility="gone" android:visibility="gone"
android:indeterminate="false" android:indeterminate="false"
android:max="100" android:max="100"
......
...@@ -3,53 +3,52 @@ ...@@ -3,53 +3,52 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/dark_grey"
android:gravity="center"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:orientation="vertical"
tools:context=".ui.StateActivity"> tools:context=".ui.StateActivity">
<include layout="@layout/item_toolbar" /> <include layout="@layout/item_toolbar" />
<android.support.v7.widget.LinearLayoutCompat <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center|top" android:orientation="horizontal">
android:background="@color/dark_grey">
<Button <Button
android:id="@+id/StateBtn" android:id="@+id/StateBtn"
android:shadowColor="@color/bg_primary_blue"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="120dp" android:width="128dp"
android:layout_gravity="fill"
android:breakStrategy="simple" android:breakStrategy="simple"
android:minLines="3" android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
android:minLines="2"
android:drawableTop="@drawable/ic_state" android:drawableTop="@drawable/ic_state"
android:drawableTint="@color/gray" android:drawableTint="@color/gray"
android:text="@string/state_btn" android:text="@string/state_btn"
android:layout_gravity="center"
android:layout_marginRight="30dp"
style="?android:attr/borderlessButtonStyle" style="?android:attr/borderlessButtonStyle"
android:textColor="@color/gray"/> android:textColor="@color/gray"/>
<Button <Button
android:id="@+id/StateMessageBtn" android:id="@+id/StateMessageBtn"
android:shadowColor="@color/bg_primary_blue"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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:breakStrategy="simple"
android:minLines="3" android:minLines="2"
android:drawableTop="@drawable/ic_state" android:drawableTop="@drawable/ic_state"
android:text="@string/state_messages_btn" android:text="@string/state_messages_btn"
android:layout_gravity="center"
android:layout_marginLeft="30dp"
style="?android:attr/borderlessButtonStyle" style="?android:attr/borderlessButtonStyle"
android:textColor="#ffffff"/> android:textColor="@color/white"/>
</android.support.v7.widget.LinearLayoutCompat> </LinearLayout>
<ListView <ListView
android:id="@+id/list" android:id="@+id/list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"/>
android:background="@color/dark_grey"/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -3,48 +3,47 @@ ...@@ -3,48 +3,47 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/dark_grey"
android:gravity="center"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:orientation="vertical"
tools:context=".ui.StateActivity"> tools:context=".ui.StateActivity">
<include layout="@layout/item_toolbar" /> <include layout="@layout/item_toolbar" />
<android.support.v7.widget.LinearLayoutCompat <LinearLayout
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"
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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxWidth="120dp" android:orientation="horizontal">
android:breakStrategy="simple" <Button
android:minLines="3" android:id="@+id/StateBtn"
android:drawableTop="@drawable/ic_state" android:layout_width="wrap_content"
android:drawableTint="@color/gray" android:layout_height="wrap_content"
android:text="@string/state_messages_btn" android:width="128dp"
android:layout_gravity="center" android:layout_gravity="fill"
android:layout_marginLeft="24dp" android:breakStrategy="simple"
style="?android:attr/borderlessButtonStyle" android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
android:textColor="@color/gray"/> android:minLines="2"
</android.support.v7.widget.LinearLayoutCompat> 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 <ListView
android:id="@+id/list" android:id="@+id/list"
......
...@@ -86,19 +86,60 @@ ...@@ -86,19 +86,60 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/contibutors" android:id="@+id/admins"
style="@android:style/TextAppearance.DeviceDefault.Large" style="@android:style/TextAppearance.DeviceDefault.Large"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="@string/contributorsTitle" /> android:text="@string/adminsTitle" />
<TextView
android:id="@+id/admins_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="" />
<TextView <TextView
android:id="@+id/mastext" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="@string/contributors" /> android:text="" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
<!-- License --> <!-- License -->
......
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
<string name="maintainersText">Diese App wird zur Zeit gepflegt und entwickelt von\n\n</string> <string name="maintainersText">Diese App wird zur Zeit gepflegt und entwickelt von\n\n</string>
<string name="disrootUrl">https://disroot.org</string> <string name="disrootUrl">https://disroot.org</string>
<string name="disroot"> * Disroot Community (Disroot):</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="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="fDroid">F-Droid</string>
<string name="thirdparty">Libraries von Drittanbietern</string> <string name="thirdparty">Libraries von Drittanbietern</string>
...@@ -204,9 +203,7 @@ ...@@ -204,9 +203,7 @@
<string name="androidVersion">Android version:</string> <string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string> <string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</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="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="hide">Hide app</string> <string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string> <string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string> <string name="action_calls">Calls</string>
...@@ -217,5 +214,9 @@ ...@@ -217,5 +214,9 @@
<string name="GitTitle">Gitea Info</string> <string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</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="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> </resources>
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
<string name="maintainersText">Actualmente, esta aplicación está siendo desarrollada y mantenida por\n\n</string> <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="disrootUrl"><a href = "https://disroot.org">https://disroot.org</a></string>
<string name="disroot"> * Comunidad de Disroot (Disroot):</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="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="fDroid">F-Droid</string>
<string name="thirdparty">Librerías de Terceros</string> <string name="thirdparty">Librerías de Terceros</string>
...@@ -165,9 +164,7 @@ ...@@ -165,9 +164,7 @@
<string name="androidVersion">Android version:</string> <string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string> <string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</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="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="hide">Hide app</string> <string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string> <string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string> <string name="action_calls">Calls</string>
...@@ -178,4 +175,8 @@ ...@@ -178,4 +175,8 @@
<string name="GitTitle">Gitea Info</string> <string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</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="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> </resources>
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
<string name="maintainersText">Cette application est actuellement développée et maintenue par\n\n</string> <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="disrootUrl">https://disroot.org</string>
<string name="disroot">* La communauté Disroot (Disroot) :</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="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="fDroid">F-Droid</string>
<string name="thirdparty">Librairies tierces</string> <string name="thirdparty">Librairies tierces</string>
...@@ -202,9 +201,7 @@ ...@@ -202,9 +201,7 @@
<string name="androidVersion">Android version:</string> <string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string> <string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</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="settings">Show/Hide Icons</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="hide">Hide app</string> <string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string> <string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string> <string name="action_calls">Calls</string>
...@@ -215,4 +212,8 @@ ...@@ -215,4 +212,8 @@
<string name="GitTitle">Gitea Info</string> <string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</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="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> </resources>
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
<string name="maintainersText">Questa app è attualmente in fase di sviluppo e manutenuta da parte di\n\n</string> <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="disrootUrl">https://disroot.org</string>
<string name="disroot"> * Comunità Disroot (Disroot):</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="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="fDroid">F-Droid</string>
<string name="thirdparty">Librerie di terze parti</string> <string name="thirdparty">Librerie di terze parti</string>
...@@ -164,9 +163,7 @@ ...@@ -164,9 +163,7 @@
<string name="androidVersion">Android version:</string> <string name="androidVersion">Android version:</string>
<string name="deviceName">Device name:</string> <string name="deviceName">Device name:</string>
<string name="edit_apps_title">Show/hide apps</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="settings">Impostazioni</string>
<string name="CloudBtnPref">Show/hide Cloud icon</string>
<string name="hide">Hide app</string> <string name="hide">Hide app</string>
<string name="dashboard">Dashboard</string> <string name="dashboard">Dashboard</string>
<string name="action_calls">Calls</string> <string name="action_calls">Calls</string>
...@@ -177,4 +174,8 @@ ...@@ -177,4 +174,8 @@
<string name="GitTitle">Gitea Info</string> <string name="GitTitle">Gitea Info</string>
<string name="GitInfo">Git with a cup of tea A painless, self-hosted Git service</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="GitsDialog">To continue you need to install GitNex first.Please select install to continue with the installation on F-Droid.</string>
<string name=