Commit 3d4dfec4 authored by Thomas Markiewicz's avatar Thomas Markiewicz
Browse files

Merge branch 'tm-remove-libremone-flavor' into 'master'

Removed libremone flavor to make merges from upstream easier

See merge request !4
parents 4cbfb45a 8249b512
Pipeline #50212 passed with stages
in 7 minutes and 11 seconds
......@@ -15,11 +15,15 @@ def getGitSha = { ->
android {
compileSdkVersion 28
defaultConfig {
applicationId "com.keylesspalace.tusky"
applicationId "one.librem.social"
// (major * 1000000) + (minor * 10000) + (patch * 100) + candidate;
versionCode = 1020099
versionName = "1.2.0"
minSdkVersion 21
targetSdkVersion 28
versionCode 68
versionName "9.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
......@@ -54,21 +58,6 @@ android {
applicationIdSuffix ".test"
versionNameSuffix "-" + getGitSha()
}
libremsocial {
applicationId "one.librem.social"
// major.minor.patch = release version that gets tagged
// major.minor.patch-SNAPSHOT = builds from `develop` branch
// major.minor.patch-RCXX = release candidate builds from the `release` branch (XX must be less then 99)
versionName = "1.2.0"
// (major * 1000000) + (minor * 10000) + (patch * 100) + candidate;
// where candidate
// = 00 for -SNAPSHOT
// = 01..98 for -RC1..98
// = 99 for the final release
versionCode = 1020099
}
}
lintOptions {
......
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<color android:color="@color/color_primary_dark_dark"/>
</item>
<item>
<bitmap
android:src="@drawable/splash_with_name"
android:gravity="center" />
</item>
</layer-list>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
tools:context="com.keylesspalace.tusky.LoginActivity">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="16dp">
<ImageView
android:layout_width="192dp"
android:layout_height="192dp"
android:layout_marginBottom="50dp"
android:contentDescription="@null"
app:srcCompat="@drawable/splash_with_name" />
<LinearLayout
android:id="@+id/loginInputLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clipChildren="false"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/domainTextInputLayout"
style="@style/TuskyTextInput"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:hint="@string/hint_domain"
app:errorEnabled="true">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/domainEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textUri" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/loginButton"
style="@style/TuskyButton"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="@string/action_login" />
<TextView
android:id="@+id/whatsAnInstanceTextView"
android:layout_width="0dp"
android:layout_height="0dp"
android:paddingTop="8dp"
android:text="@string/link_whats_an_instance"
android:textAlignment="center" />
</LinearLayout>
<LinearLayout
android:id="@+id/loginLoadingLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
<TextView
android:layout_width="250dp"
android:layout_height="wrap_content"
android:paddingTop="10dp"
android:text="@string/login_connection"
android:textAlignment="center" />
</LinearLayout>
</LinearLayout>
</ScrollView>
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_alignParentTop="true"
android:background="@android:color/transparent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:parentTag="android.widget.LinearLayout">
<RadioGroup
android:id="@+id/visibilityRadioGroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/compose_options_margin"
android:layout_marginLeft="@dimen/compose_options_margin"
android:layout_marginRight="@dimen/compose_options_margin"
android:layout_marginTop="4dp"
android:orientation="vertical">
<RadioButton
android:id="@+id/publicRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_weight="1"
android:paddingEnd="0dp"
android:paddingStart="10dp"
android:text="@string/visibility_public"
android:textColor="?android:textColorTertiary"
app:buttonTint="?attr/compound_button_color" />
<RadioButton
android:id="@+id/unlistedRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
android:layout_weight="1"
android:paddingEnd="0dp"
android:paddingStart="10dp"
android:text="@string/visibility_unlisted"
android:textColor="?android:textColorTertiary"
app:buttonTint="?attr/compound_button_color" />
<RadioButton
android:id="@+id/privateRadioButton"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
android:layout_weight="1"
android:paddingEnd="0dp"
android:paddingStart="10dp"
android:text="@string/visibility_private"
android:textColor="?android:textColorTertiary"
app:buttonTint="?attr/compound_button_color" />
<RadioButton
android:id="@+id/directRadioButton"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_weight="1"
android:paddingEnd="0dp"
android:paddingStart="10dp"
android:text="@string/visibility_direct"
android:textColor="?android:textColorTertiary"
app:buttonTint="?attr/compound_button_color" />
</RadioGroup>
</merge>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [
<!ENTITY appname "Librem Social">
<!ENTITY appsite "https://source.puri.sm/liberty/social/android">
<!ENTITY issuesurl "https://source.puri.sm/liberty/social/android/issues">
]>
<resources>
<string name="about_tusky_version">&appname; %s</string>
<string name="about_tusky_license">&appname; és programari gratuït, lliure i de codi obert.
Està llicenciat en els termes de la Llicència Pública General GNU versió 3.
Podeu trobar les llicència aquí: https://www.gnu.org/licenses/gpl-3.0.ca.html</string>
<!-- note to translators: the url can be changed to link to the localized version of the license -->
<string name="about_project_site">
Lloc web del projecte:\n
&appsite;
</string>
<string name="about_bug_feature_request_site">
Informes d\'errors i peticions de funcionalitats:\n
&issuesurl;
</string>
<string name="about_tusky_account">Perfil del &appname;</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [
<!ENTITY appname "Librem Social">
<!ENTITY appsite "https://source.puri.sm/liberty/social/android">
<!ENTITY issuesurl "https://source.puri.sm/liberty/social/android/issues">
]>
<resources>
<string name="about_tusky_version">&appname; %s</string>
<string name="about_tusky_license">Mae &appname; yn feddalwedd ffynhonnell agored barn rydd.
Fe\'i trwyddedir dan Drwydded Gyhoeddus Gyffredinol GNU Fersiwn 3.
Gallwch weld y drwydded yma: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
<!-- note to translators:
* you should think of “free” as in “free speech,” not as in “free beer”.
We sometimes call it “libre software,” borrowing the French or Spanish word for “free” as in freedom,
to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
* the url can be changed to link to the localized version of the license.
-->
<string name="about_project_site">
Gwefan y prosiect:\n
&appsite;
</string>
<string name="about_bug_feature_request_site">
Adrodd byg &amp; ceisiadau nodwedd:\n
&issuesurl;
</string>
<string name="about_tusky_account">Proffil &appname;</string>
<string name="restart_emoji">Bydd angen ailddechrau &appname; i roi\'r newidiadau ar waith</string>
<string name="license_description">Mae gan &appname; god ac asedau o\'r prosiectau ffynhonnell agored canlynol:</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [
<!ENTITY appname "Librem Social">
<!ENTITY appsite "https://source.puri.sm/liberty/social/android">
<!ENTITY issuesurl "https://source.puri.sm/liberty/social/android/issues">
]>
<resources>
<string name="about_tusky_version">&appname; %s</string>
<string name="about_tusky_license">&appname; ist freie Open-Source-Software.
Es ist lizenziert unter der GNU General Public License Version 3.
Du kannst dir die Lizenz hier anschauen: https://www.gnu.org/licenses/gpl-3.0.de.html</string>
<string name="about_project_site">
Webseite des Projekts:\n
&appsite;
</string>
<string name="about_bug_feature_request_site">
Fehlermeldungen &amp; Verbesserungsvorschläge:\n
&issuesurl;
</string>
<string name="about_tusky_account">&appname; Profil</string>
<string name="restart_emoji">Du musst &appname; neustarten um die Änderungen anzuwenden</string>
<string name="license_description">&appname; enthält Code und Inhalte von den folgenden Open-Source-Projekten:</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [
<!ENTITY appname "Librem Social">
<!ENTITY appsite "https://source.puri.sm/liberty/social/android">
<!ENTITY issuesurl "https://source.puri.sm/liberty/social/android/issues">
]>
<resources>
<string name="about_tusky_version">&appname; %s</string>
<string name="about_tusky_license">&appname; es un software libre y de código abierto.
Está licenciado bajo la licencia "GNU General Public License Version 3".
Puedes leer sobre la misma en: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
<!-- note to translators:
* you should think of “free” as in “free speech,” not as in “free beer”.
We sometimes call it “libre software,” borrowing the French or Spanish word for “free” as in freedom,
to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
* the url can be changed to link to the localized version of the license.
-->
<string name="about_project_site">
Sitio del proyecto:\n
&appsite;
</string>
<string name="about_bug_feature_request_site">
Reporte de errores y peticiones de características:\n
&issuesurl;
</string>
<string name="about_tusky_account">Perfil de &appname;</string>
<string name="license_description">&appname; contiene código y recursos de los siguientes proyectos:</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [
<!ENTITY appname "Librem Social">
<!ENTITY appsite "https://source.puri.sm/liberty/social/android">
<!ENTITY issuesurl "https://source.puri.sm/liberty/social/android/issues">
]>
<resources>
<string name="about_tusky_version">&appname; %s</string>
<string name="about_tusky_license">&appname; software libre eta kode askekoa da.
"GNU General Public License Version 3" lizentziapean zabaldua.
Lizentzia hontaz gehiago irakurtzeko: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
<!-- note to translators:
* you should think of “free” as in “free speech,” not as in “free beer”.
We sometimes call it “libre software,” borrowing the French or Spanish word for “free” as in freedom,
to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
* the url can be changed to link to the localized version of the license.
-->
<string name="about_project_site">
Proiektuaren gunea:\n
&appsite;
</string>
<string name="about_bug_feature_request_site">
Akats jakinarazpenak eta hobekuntza eskariak:\n
&issuesurl;
</string>
<string name="about_tusky_account">&appname;-ren profila</string>
<string name="license_description">&appname;-k ondorengo proiektuetako kode eta baliabideak ditu:</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [
<!ENTITY appname "Librem Social">
<!ENTITY appsite "https://source.puri.sm/liberty/social/android">
<!ENTITY issuesurl "https://source.puri.sm/liberty/social/android/issues">
]>
<resources>
<string name="about_tusky_version">&appname; %s</string>
<string name="about_tusky_license" >&appname; یک برنامه آزاد و متن‌باز است که تحت مجوز GNU General Public License Version 3. منتشر شده است.\n
شما می‌توانید مجوز را از اینجا ببینید:\n
https://www.gnu.org/licenses/gpl-3.0.en.html</string>
<string name="about_project_site">
سایت پروژه\n
&appsite;
</string>
<string name="about_bug_feature_request_site">
گزارش خطا و درخواست ویژگی:\n
&issuesurl;
</string>
<string name="about_tusky_account" >&appname;نمایه </string>
<string name="license_description" >&appname; شامل کد و دارایی‌های پروژه‌های منبع‌باز زیر است:</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [
<!ENTITY appname "Librem Social">
<!ENTITY appsite "https://source.puri.sm/liberty/social/android">
<!ENTITY issuesurl "https://source.puri.sm/liberty/social/android/issues">
]>
<resources>
<string name="about_tusky_version">&appname; %s</string>
<string name="about_tusky_license">&appname; on Tusky:in perustuva vapaa avoimen lähdekoodin sovellus, joka on räätälöity https://librem.one -palveluille.
Se on lisenssoitu GNU General Public License Version 3 -lisenssillä.
Katso lisenssi tästä here: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
<!-- note to translators:
* you should think of “free” as in “free speech,” not as in “free beer”.
We sometimes call it “libre software,” borrowing the French or Spanish word for “free” as in freedom,
to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
* the url can be changed to link to the localized version of the license.
-->
<string name="about_project_site">
Projekstin verkkosivu:\n
&appsite;
</string>
<string name="about_bug_feature_request_site">
Vikailmoitukset &amp; ehdotukset ominaisuuksiksi:\n
&issuesurl;
</string>
<string name="about_tusky_account">&appname; profiili</string>
<string name="restart_emoji">Sinun täytyy käynnistää &appname; uudelleen, jota muutokset tulevat voimaan.</string>
<string name="license_description">&appname; sisältää koodia ja toimintoja seuraavista avoimen lähdekodi projekteista:</string>
<string name="action_login">KIRJAUDU</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [
<!ENTITY appname "Librem Social">
<!ENTITY appsite "https://source.puri.sm/liberty/social/android">
<!ENTITY issuesurl "https://source.puri.sm/liberty/social/android/issues">
]>
<resources>
<string name="about_tusky_version">&appname; %s</string>
<string name="about_tusky_license">&appname; est une application libre et open source.
Elle est publiée sous licence publique générale GNU version 3.
Vous pouvez consulter la licence ici : https://www.gnu.org/licenses/gpl-3.0.fr.html</string>
<!-- note to translators:
* you should think of “free” as in “free speech,” not as in “free beer”.
We sometimes call it “libre software,” borrowing the French or Spanish word for “free” as in freedom,
to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
* the url can be changed to link to the localized version of the license.
-->
<string name="about_project_site">
Site du projet :\n
&appsite;
</string>
<string name="about_bug_feature_request_site">
Rapports d’anomalies &amp; demandes de fonctionnalités :\n
&issuesurl;
</string>
<string name="about_tusky_account">Profil de &appname;</string>
<string name="restart_emoji">Vous devrez redémarrer &appname; pour appliquer ces modifications</string>
<string name="license_description">&appname; contient du code et des ressources issus des projets open source suivants :</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE resources [
<!ENTITY appname "Librem Social">
<!ENTITY appsite "https://source.puri.sm/liberty/social/android">
<!ENTITY issuesurl "https://source.puri.sm/liberty/social/android/issues">
]>
<resources>
<string name="about_project_site">
Projekt honlapja:\n
&appsite;
</string>
<string name="about_bug_feature_request_site">
Hibajeletés &amp; funkcionalitási kérések:\n
&issuesurl;
</string>
<string name="about_tusky_account">&appname; Profilja</string>
</resources>
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE resources [
<!ENTITY appname "Librem Social">
<!ENTITY appsite "https://source.puri.sm/liberty/social/android">
<!ENTITY issuesurl "https://source.puri.sm/liberty/social/android/issues">
]>
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="about_tusky_version">&appname; %s</string>
<string name="about_tusky_license">&appname; è un programma libero ed open source.
È distribuito con licenza GNU General Public License Version 3.
Puoi leggere la licenza qui: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
<!-- note to translators:
* you should think of “free” as in “free speech,” not as in “free beer”.
We sometimes call it “libre software,” borrowing the French or Spanish word for “free” as in freedom,
to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
* the url can be changed to link to the localized version of the license.
-->
<string name="about_project_site">
Sito web del progetto:\n
&appsite;
</string>
<string name="about_bug_feature_request_site">
Segnala problemi &amp; richiedi funzionalità:\n
&issuesurl;
</string>
<string name="about_tusky_account">Profilo di &appname;</string>
<string name="restart_emoji">Devi riavviare &appname; per applicare queste modifiche</string>
<string name="license_description">&appname; contiene codice e risorse dai seguenti progetti open source:</string>
</resources>
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE resources [
<!ENTITY appname "Librem Social">
<!ENTITY appsite "https://source.puri.sm/liberty/social/android">
<!ENTITY issuesurl "https://source.puri.sm/liberty/social/android/issues">
]>
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="about_tusky_version">&appname; %s</string>
<string name="about_tusky_license">&appname;は無料のオープンソースソフトウェアです。<!--
-->GNU General Public License Version 3 の下で使用許諾されています。<!--
-->ライセンスはここからご覧いただけます: https://www.gnu.org/licenses/gpl-3.0.ja.html</string>
<!-- Commented out line breaks brcause inserting a space after the japanese period is incorrect. -->
<string name="about_project_site">
プロジェクトのWebサイト(英語):\n