Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refresh about dialog

Browse Source 
Now it's vertically-oriented. Mention of Aptoide is removed because
F-Droid went far away from it.
This commit is contained in:
relan 2015-11-24 18:11:58 +03:00
parent 2ecb519a56
commit 88c2774692
4 changed files with 42 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
F-Droid/res/layout/about.xml
View File

@ -1,101 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="match_parent">
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="24dp"
android:paddingEnd="24dp"
android:paddingTop="20dp"
android:baselineAligned="false"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:orientation="horizontal"> android:paddingLeft="24dp"
android:paddingRight="24dp"
android:paddingTop="4dp"
android:orientation="vertical">
<TextView <TextView
android:text="@string/about_version" android:text="@string/about_version"
android:textStyle="bold" style="@style/CaptionText" />
android:layout_width="wrap_content" <TextView
android:layout_height="wrap_content" /> android:id="@+id/version"
android:text="@string/unknown"
<TextView android:id="@+id/version" style="@style/BodyText" />
android:paddingLeft="8sp"
android:paddingStart="8sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal">
<TextView <TextView
android:text="@string/about_site" android:text="@string/about_site"
android:textStyle="bold" style="@style/CaptionText" />
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView <TextView
android:text="@string/site_link" android:text="@string/site_link"
android:paddingLeft="8sp"
android:paddingStart="8sp"
android:autoLink="web" android:autoLink="web"
android:layout_width="wrap_content" style="@style/BodyText" />
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal">
<TextView
android:text="@string/about_source"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:text="@string/source_link"
android:paddingLeft="8sp"
android:paddingStart="8sp"
android:autoLink="web"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal">
<TextView <TextView
android:text="@string/about_mail" android:text="@string/about_mail"
android:textStyle="bold" style="@style/CaptionText" />
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView <TextView
android:text="@string/team_email" android:text="@string/team_email"
android:paddingLeft="8sp"
android:paddingStart="8sp"
android:autoLink="email" android:autoLink="email"
android:layout_width="wrap_content" style="@style/BodyText" />
android:layout_height="wrap_content" />
<TextView
android:text="@string/about_source"
style="@style/CaptionText" />
<TextView
android:text="@string/source_link"
android:autoLink="web"
style="@style/BodyText" />
<TextView
android:text="@string/about_license"
style="@style/CaptionText" />
<TextView
android:text="@string/license_gplv3_later"
style="@style/BodyText" />
</LinearLayout> </LinearLayout>
<TextView </ScrollView>
android:text="@string/about_desc"
android:paddingTop="12dp"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
</LinearLayout>

1
F-Droid/res/values/donottranslate.xml
View File

@ -4,6 +4,7 @@
<string name="site_link">https://f-droid.org</string> <string name="site_link">https://f-droid.org</string>
<string name="source_link">https://gitlab.com/fdroid/fdroidclient</string> <string name="source_link">https://gitlab.com/fdroid/fdroidclient</string>
<string name="team_email">team@f-droid.org</string> <string name="team_email">team@f-droid.org</string>
<string name="license_gplv3_later">GNU General Public License version\u00A03 or later</string>
<string name="https">https://</string> <string name="https">https://</string>

11
F-Droid/res/values/strings.xml
View File

@ -47,12 +47,11 @@
<string name="no_such_app">No such app found.</string> <string name="no_such_app">No such app found.</string>
<string name="about_title">About F-Droid</string> <string name="about_title">About F-Droid</string>
<string name="about_version">Version:</string> <string name="about_version">Version</string>
<string name="about_site">Website:</string> <string name="about_site">Website</string>
<string name="about_source">Source:</string> <string name="about_source">Source code</string>
<string name="about_mail">E-Mail:</string> <string name="about_mail">Email</string>
<string name="about_desc">Originally based on Aptoide.\nReleased under the <string name="about_license">License</string>
GNU GPLv3 license.</string>
<string name="app_incompatible">Incompatible</string> <string name="app_incompatible">Incompatible</string>
<string name="app_installed">Installed</string> <string name="app_installed">Installed</string>

5
F-Droid/src/org/fdroid/fdroid/FDroid.java
View File

@ -289,10 +289,9 @@ public class FDroid extends ActionBarActivity {
View view = LayoutInflater.from(this).inflate(R.layout.about, null); View view = LayoutInflater.from(this).inflate(R.layout.about, null);
String versionName = Utils.getVersionName(this); String versionName = Utils.getVersionName(this);
if (versionName == null) { if (versionName != null) {
versionName = getString(R.string.unknown); ((TextView) view.findViewById(R.id.version)).setText(versionName);
} }
((TextView) view.findViewById(R.id.version)).setText(versionName);
AlertDialog alrt = new AlertDialog.Builder(this).setView(view).create(); AlertDialog alrt = new AlertDialog.Builder(this).setView(view).create();
alrt.setTitle(R.string.about_title); alrt.setTitle(R.string.about_title);