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

Merge commit 'refs/merge-requests/46' of gitorious.org:f-droid/fdroidclient

Browse Source
This commit is contained in:
Daniel Martí 2013-06-27 14:50:33 +02:00
commit 4a61c20e92
7 changed files with 54 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout-land/appdetails.xml
View File

@ -14,6 +14,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:paddingRight="6dp"
android:orientation="vertical" >
<RelativeLayout
@ -66,4 +67,4 @@
android:layout_height="fill_parent"
android:layout_weight="0.5" />
</LinearLayout>
</LinearLayout>

65
res/layout/about.xml
View File

@ -1,52 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" android:paddingLeft="5px">
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:orientation="vertical">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal">
<TextView android:text="@string/about_version"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:textSize="16px" android:textColor="#ffffff" />
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:id="@+id/version" android:layout_width="wrap_content"
<TextView android:id="@+id/version"
android:paddingLeft="5dp"
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">
android:layout_height="fill_parent"
android:orientation="horizontal">
<TextView android:id="@+id/site" android:text="@string/about_site"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:textSize="16px" android:textColor="#ffffff" />
<TextView android:id="@+id/site"
android:text="@string/about_site"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:id="@+id/sitec" android:text="@string/about_sitec"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:id="@+id/sitec"
android:text="@string/about_sitec"
android:paddingLeft="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal">
<TextView android:id="@+id/mail" android:text="@string/about_mail"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:textSize="16px" android:textColor="#ffffff" />
<TextView android:id="@+id/mail"
android:text="@string/about_mail"
android:textStyle="bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView android:id="@+id/mailc" android:text="@string/about_mailc"
android:autoLink="email" android:layout_width="wrap_content"
<TextView android:id="@+id/mailc"
android:text="@string/about_mailc"
android:paddingLeft="5dp"
android:autoLink="email"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView android:id="@+id/not" android:text="@string/about_not"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
<TextView android:text="@string/about_desc"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:textSize="16px" />
android:paddingTop="5dp"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
</LinearLayout>

4
res/layout/apklistitem.xml
View File

@ -5,8 +5,8 @@
android:orientation="vertical"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp">
android:paddingLeft="2dp"
android:paddingRight="2dp">
<TextView android:id="@+id/buildtype"
android:textSize="12sp"

5
res/layout/appdetails.xml
View File

@ -2,6 +2,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingTop="5dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:orientation="vertical" >
<LinearLayout
@ -56,4 +59,4 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
</LinearLayout>
</LinearLayout>

5
res/layout/applistitem.xml
View File

@ -3,7 +3,7 @@
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="0dp"
android:paddingTop="3dp"
android:paddingBottom="4dp"
android:paddingLeft="6dp"
android:paddingRight="10dp">
@ -43,6 +43,7 @@
android:layout_height="wrap_content"
android:layout_toRightOf="@id/icon"
android:layout_toLeftOf="@id/status_icons"
android:paddingTop="4dp"
android:paddingBottom="2dp"
android:paddingLeft="1dp"/>
@ -72,6 +73,6 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/icon"
android:paddingLeft="4dp"/>
android:paddingLeft="6dp"/>
</RelativeLayout>

1
res/values/strings.xml
View File

@ -36,7 +36,6 @@
<string name="about_mailc">admin@f-droid.org</string>
<string name="about_version">Version: </string>
<string name="about_website">Website</string>
<string name="about_not"> </string>
<string name="no_repo">You don\'t have any repositories configured!\n\nA
repository is a source of applications. To add one, press the MENU

2
src/org/fdroid/fdroid/AppDetails.java
View File

@ -115,7 +115,7 @@ public class AppDetails extends ListActivity {
TextView version = (TextView) v.findViewById(R.id.version);
boolean iscurrent = apk.vercode == app_currentvercode;
version.setText(getString(R.string.version) + " " + apk.version
+ (iscurrent ? "*" : ""));
+ (iscurrent ? " *" : ""));
TextView status = (TextView) v.findViewById(R.id.status);
if (apk.vercode == app.installedVerCode