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

Get rid of many tabs for consistency

Browse Source
This commit is contained in:
Daniel Martí 2015-10-19 09:21:48 +02:00
parent 0b2aac253b
commit abf4528d02
10 changed files with 205 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTING.md
View File

@ -46,7 +46,7 @@ it. We enforce some of these, but not all, via checkstyle.
To get all the logcat messages by F-Droid, you can run: To get all the logcat messages by F-Droid, you can run:
adb logcat | grep `adb shell ps | grep org.fdroid.fdroid | cut -c10-15` adb logcat | grep `adb shell ps | grep org.fdroid.fdroid | cut -c10-15`
## Building tips ## Building tips
@ -60,7 +60,7 @@ In order to run the F-Droid test suite, you will need to have either a real devi
connected via `adb`, or an emulator running. Then, execute the following from the connected via `adb`, or an emulator running. Then, execute the following from the
command line: command line:
gradle connectedCheck gradle connectedCheck
Note that the CI already runs the tests on an emulator, so you don't Note that the CI already runs the tests on an emulator, so you don't
necessarily have to do this yourself if you open a merge request as the tests necessarily have to do this yourself if you open a merge request as the tests

8
F-Droid/res/layout-land/app_details.xml
View File

@ -3,9 +3,9 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="horizontal"> android:orientation="horizontal">
<ScrollView <ScrollView
android:id="@+id/app_summary_container" android:id="@+id/app_summary_container"
@ -17,7 +17,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:padding="5dp"> android:padding="5dp">
<fragment <fragment
android:layout_width="fill_parent" android:layout_width="fill_parent"

2
F-Droid/res/layout/apklistitem.xml
View File

@ -2,7 +2,7 @@
<RelativeLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="5dp" android:paddingTop="5dp"

2
F-Droid/res/layout/app_details.xml
View File

@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout

185
F-Droid/res/layout/applistitem.xml
View File

@ -1,108 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp" android:padding="10dp"
android:baselineAligned="false" android:baselineAligned="false"
xmlns:tools="http://schemas.android.com/tools" > xmlns:tools="http://schemas.android.com/tools" >
<!-- Actual icon size is dependent on preferences and set in <!-- Actual icon size is dependent on preferences and set in AppListAdapater.java:layoutIcon() -->
AppListAdapater.java:layoutIcon() --> <ImageView
<ImageView android:id="@+id/icon"
android:id="@+id/icon" android:contentDescription="@string/app_icon"
android:contentDescription="@string/app_icon" android:layout_width="48dip"
android:layout_width="48dip" android:layout_height="48dip"
android:layout_height="48dip" android:layout_gravity="center_vertical"
android:layout_gravity="center_vertical" android:scaleType="fitCenter"
android:scaleType="fitCenter" tools:src="@drawable/ic_launcher" />
tools:src="@drawable/ic_launcher" />
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingLeft="?attr/listPreferredItemPaddingLeft" android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight" android:paddingRight="?attr/listPreferredItemPaddingRight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:baselineAligned="false" > android:baselineAligned="false" >
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:baselineAligned="false" android:baselineAligned="false"
android:layout_marginBottom="3dp" > android:layout_marginBottom="3dp" >
<TextView android:id="@+id/name" <TextView android:id="@+id/name"
android:textSize="17sp" android:textSize="17sp"
android:textStyle="bold" android:textStyle="bold"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="start" android:gravity="start"
android:textAlignment="viewStart" android:textAlignment="viewStart"
tools:text="F-Droid" /> tools:text="F-Droid" />
<TextView android:id="@+id/status" <TextView android:id="@+id/status"
android:textSize="13sp" android:textSize="13sp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:layout_weight="0" android:layout_weight="0"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="?attr/listPreferredItemPaddingLeft" android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart" android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="end" android:gravity="end"
android:textAlignment="viewEnd" android:textAlignment="viewEnd"
tools:text="Installed" tools:text="Installed"
/> />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:baselineAligned="false" android:baselineAligned="false"
> >
<TextView android:id="@+id/summary" <TextView android:id="@+id/summary"
android:textSize="13sp" android:textSize="13sp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="start" android:gravity="start"
android:textAlignment="viewStart" android:textAlignment="viewStart"
tools:text="Application manager" tools:text="Application manager"
/> />
<TextView android:id="@+id/license" <TextView android:id="@+id/license"
android:textSize="12sp" android:textSize="12sp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:layout_weight="0" android:layout_weight="0"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="?attr/listPreferredItemPaddingLeft" android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart" android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="end" android:gravity="end"
android:textAlignment="viewEnd" android:textAlignment="viewEnd"
tools:text="GPLv3" tools:text="GPLv3"
/> />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

22
F-Droid/res/layout/fdroid.xml
View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fdroid_layout" android:id="@+id/fdroid_layout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_pager" android:id="@+id/main_pager"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent">
</android.support.v4.view.ViewPager> </android.support.v4.view.ViewPager>
</LinearLayout> </LinearLayout>

34
F-Droid/res/layout/searchresults.xml
View File

@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingRight="2dp" android:paddingRight="2dp"
android:paddingEnd="2dp" android:paddingEnd="2dp"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="vertical"> android:orientation="vertical">
<TextView android:id="@+id/description" <TextView android:id="@+id/description"
android:singleLine="false" android:singleLine="false"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:padding="4dp"
android:gravity="center" /> android:gravity="center" />
<ListView android:id="@android:id/list" <ListView android:id="@android:id/list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" /> android:layout_height="fill_parent" />
</LinearLayout> </LinearLayout>

138
F-Droid/res/xml/preferences.xml
View File

@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/updates"> <PreferenceCategory android:title="@string/updates">
<ListPreference android:title="@string/update_interval" <ListPreference android:title="@string/update_interval"
android:key="updateInterval" android:key="updateInterval"
android:defaultValue="24" android:defaultValue="24"
android:entries="@array/updateIntervalNames" android:entries="@array/updateIntervalNames"
android:entryValues="@array/updateIntervalValues" /> android:entryValues="@array/updateIntervalValues" />
<CheckBoxPreference android:title="@string/automatic_scan_wifi" <CheckBoxPreference android:title="@string/automatic_scan_wifi"
android:defaultValue="false" android:defaultValue="false"
android:key="updateOnWifiOnly" /> android:key="updateOnWifiOnly" />
<CheckBoxPreference android:title="@string/notify" <CheckBoxPreference android:title="@string/notify"
android:defaultValue="true" android:defaultValue="true"
android:key="updateNotify" /> android:key="updateNotify" />
<EditTextPreference <EditTextPreference
android:defaultValue="14" android:defaultValue="14"
android:key="updateHistoryDays" android:key="updateHistoryDays"
android:maxLength="2" android:maxLength="2"
android:numeric="integer" android:numeric="integer"
android:title="@string/update_history" /> android:title="@string/update_history" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/display"> <PreferenceCategory android:title="@string/display">
<ListPreference android:title="@string/pref_language" <ListPreference android:title="@string/pref_language"
android:key="language" android:key="language"
android:defaultValue="" android:defaultValue=""
@ -27,29 +27,29 @@
<CheckBoxPreference android:title="@string/compactlayout" <CheckBoxPreference android:title="@string/compactlayout"
android:defaultValue="false" android:defaultValue="false"
android:key="compactlayout"/> android:key="compactlayout"/>
<ListPreference android:title="@string/theme" <ListPreference android:title="@string/theme"
android:key="theme" android:key="theme"
android:defaultValue="light" android:defaultValue="light"
android:entries="@array/themeNames" android:entries="@array/themeNames"
android:entryValues="@array/themeValues" /> android:entryValues="@array/themeValues" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/appcompatibility"> <PreferenceCategory android:title="@string/appcompatibility">
<CheckBoxPreference android:title="@string/show_incompat_versions" <CheckBoxPreference android:title="@string/show_incompat_versions"
android:defaultValue="false" android:defaultValue="false"
android:key="incompatibleVersions" /> android:key="incompatibleVersions" />
<CheckBoxPreference android:title="@string/rooted" <CheckBoxPreference android:title="@string/rooted"
android:defaultValue="true" android:defaultValue="true"
android:key="rooted" /> android:key="rooted" />
<CheckBoxPreference android:title="@string/ignoreTouch" <CheckBoxPreference android:title="@string/ignoreTouch"
android:defaultValue="false" android:defaultValue="false"
android:key="ignoreTouchscreen" /> android:key="ignoreTouchscreen" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/local_repo"> <PreferenceCategory android:title="@string/local_repo">
<EditTextPreference <EditTextPreference
android:key="localRepoName" android:key="localRepoName"
android:title="@string/local_repo_name" /> android:title="@string/local_repo_name" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/proxy" > <PreferenceCategory android:title="@string/proxy" >
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:key="enableProxy" android:key="enableProxy"
@ -58,34 +58,34 @@
<EditTextPreference <EditTextPreference
android:key="proxyHost" android:key="proxyHost"
android:title="@string/proxy_host" android:title="@string/proxy_host"
android:summary="@string/proxy_host_summary" android:summary="@string/proxy_host_summary"
android:dependency="enableProxy" /> android:dependency="enableProxy" />
<EditTextPreference <EditTextPreference
android:key="proxyPort" android:key="proxyPort"
android:title="@string/proxy_port" android:title="@string/proxy_port"
android:summary="@string/proxy_port_summary" android:summary="@string/proxy_port_summary"
android:dependency="enableProxy" /> android:dependency="enableProxy" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/other"> <PreferenceCategory android:title="@string/other">
<CheckBoxPreference android:title="@string/cache_downloaded" <CheckBoxPreference android:title="@string/cache_downloaded"
android:defaultValue="false" android:defaultValue="false"
android:key="cacheDownloaded" /> android:key="cacheDownloaded" />
<CheckBoxPreference android:title="@string/expert" <CheckBoxPreference android:title="@string/expert"
android:defaultValue="false" android:defaultValue="false"
android:key="expert" /> android:key="expert" />
<CheckBoxPreference <CheckBoxPreference
android:key="unstableUpdates" android:key="unstableUpdates"
android:title="@string/unstable_updates" android:title="@string/unstable_updates"
android:summary="@string/unstable_updates_summary" android:summary="@string/unstable_updates_summary"
android:defaultValue="false" android:defaultValue="false"
android:dependency="expert" /> android:dependency="expert" />
<CheckBoxPreference android:title="@string/system_installer" <CheckBoxPreference android:title="@string/system_installer"
android:defaultValue="false" android:defaultValue="false"
android:key="privilegedInstaller" android:key="privilegedInstaller"
android:dependency="expert" /> android:dependency="expert" />
<Preference android:title="@string/uninstall_system" <Preference android:title="@string/uninstall_system"
android:summary="@string/uninstall_system_summary" android:summary="@string/uninstall_system_summary"
android:key="uninstallPrivilegedApp" android:key="uninstallPrivilegedApp"
android:dependency="expert" /> android:dependency="expert" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

4
README.md
View File

@ -10,8 +10,8 @@ for Android.
The only requirements are the [Android SDK](https://developer.android.com/sdk/) The only requirements are the [Android SDK](https://developer.android.com/sdk/)
and [Gradle](http://gradle.org/) 2.7: and [Gradle](http://gradle.org/) 2.7:
cd F-Droid cd F-Droid
gradle assembleRelease gradle assembleRelease
## Direct download ## Direct download

12
settings.gradle
View File

@ -2,12 +2,12 @@ include ':F-Droid'
include ':Privileged-Extension' include ':Privileged-Extension'
include ':privileged-api-lib' include ':privileged-api-lib'
if (hasProperty('sourceDeps')) { if (hasProperty('sourceDeps')) {
include ':extern:support-v4-preferencefragment' include ':extern:support-v4-preferencefragment'
include ':extern:nanohttpd:core' include ':extern:nanohttpd:core'
include ':extern:zipsigner' include ':extern:zipsigner'
// Needed for zipsigner // Needed for zipsigner
include ':extern:spongycastle:core' include ':extern:spongycastle:core'
include ':extern:spongycastle:pkix' include ':extern:spongycastle:pkix'
include ':extern:spongycastle:prov' include ':extern:spongycastle:prov'
} }