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

Remove AppDetails (in preference to AppDetails2).

Browse Source 
Also removed associated layouts which are no longer required.
This commit is contained in:
Peter Serwylo 2017-03-28 11:51:41 +11:00
parent 3efb3a3043
commit fada693ac9
10 changed files with 24 additions and 2474 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1803
app/src/main/java/org/fdroid/fdroid/AppDetails.java
View File

File diff suppressed because it is too large Load Diff

21
app/src/main/java/org/fdroid/fdroid/AppDetails2.java
View File

@ -1,3 +1,24 @@
/*
* Copyright (C) 2010-12 Ciaran Gultnieks, ciaran@ciarang.com
* Copyright (C) 2013-15 Daniel Martí <mvdan@mvdan.cc>
* Copyright (C) 2013 Stefan Völkel, bd@bc-bd.org
* Copyright (C) 2015 Nico Alt, nicoalt@posteo.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 3
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package org.fdroid.fdroid;
import android.app.Activity;

2
app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java
View File

@ -415,7 +415,7 @@ public class AppSecurityPermissions {
|| ((pInfo.protectionLevel & PermissionInfo.PROTECTION_FLAG_PRE23) != 0);
// Dangerous and normal permissions are always shown to the user
// this is matches the permission list in AppDetails
// this is matches the permission list in AppDetails2
if (isNormal || isDangerous) {
return true;
}

2
app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java
View File

@ -147,7 +147,7 @@ public class RepoDetailsActivity extends ActionBarActivity {
LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver,
new IntentFilter(UpdateService.LOCAL_ACTION_STATUS));
// FDroid.java and AppDetails set different NFC actions, so reset here
// FDroid.java and AppDetails2 set different NFC actions, so reset here
setNfc();
processIntent(getIntent());
}

2
app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
View File

@ -147,7 +147,7 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationB
setSelectedMenuInNav();
}
// AppDetails 2 and RepoDetailsActivity set different NFC actions, so reset here
// AppDetails2 and RepoDetailsActivity set different NFC actions, so reset here
NfcHelper.setAndroidBeam(this, getApplication().getPackageName());
checkForAddRepoIntent(getIntent());
}

47
app/src/main/res/layout-land/app_details.xml
View File

@ -1,47 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:baselineAligned="false"
android:orientation="horizontal">
<ScrollView
android:id="@+id/app_summary_container"
android:layout_width="0px"
android:layout_weight="0.5"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="5dp">
<fragment
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/header"
android:name="org.fdroid.fdroid.AppDetails$AppDetailsHeaderFragment"
tools:layout="@layout/app_details_header"/>
<fragment
android:id="@+id/fragment_app_summary"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:name="org.fdroid.fdroid.AppDetails$AppDetailsSummaryFragment"
tools:layout="@layout/app_details_summary"/>
</LinearLayout>
</ScrollView>
<fragment
android:id="@+id/fragment_app_list"
android:layout_width="0px"
android:layout_weight="0.5"
android:layout_height="wrap_content"
android:name="org.fdroid.fdroid.AppDetails$AppDetailsListFragment"/>
</LinearLayout>

179
app/src/main/res/layout-v21/app_details_header.xml
View File

@ -1,179 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2015 Nico Alt, nicoalt@posteo.org
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 3
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/icon_and_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:orientation="horizontal"
android:padding="2dp">
<ImageView
android:id="@+id/icon"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_gravity="center_vertical"
android:contentDescription="@string/app_icon"
android:scaleType="fitCenter"
tools:src="@drawable/ic_launcher"
android:transitionName="@string/transition_app_item_icon" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:baselineAligned="false"
android:orientation="vertical"
android:layout_toRightOf="@id/icon"
android:layout_toEndOf="@id/icon"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:gravity="start"
android:singleLine="true"
android:textAlignment="viewStart"
android:textSize="17sp"
android:textStyle="bold"
tools:text="F-Droid" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:baselineAligned="false"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="3dp"
android:layout_weight="1"
android:baselineAligned="false"
android:orientation="vertical">
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:gravity="start"
android:singleLine="true"
android:textAlignment="viewStart"
android:textSize="13sp"
android:visibility="gone"
tools:text="F-Droid Authors" />
<TextView
android:id="@+id/current_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:gravity="start"
android:singleLine="true"
android:textAlignment="viewStart"
android:textSize="13sp"
tools:text="1.24" />
<TextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:gravity="start"
android:singleLine="true"
android:textAlignment="viewStart"
android:textSize="13sp"
tools:text="Version 1.23 installed" />
</LinearLayout>
<Button
android:id="@+id/btn_main"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_weight="0"
android:baselineAligned="false"
tools:text="Open" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/icon"
android:gravity="center">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1">
<ProgressBar
android:id="@+id/progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal" />
<TextView
android:id="@+id/progress_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_below="@id/progress_bar"
android:visibility="gone"
android:textSize="12sp"/>
<TextView
android:id="@+id/progress_percentage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@id/progress_bar"
android:visibility="gone"
android:textSize="12sp"/>
</RelativeLayout>
<ImageButton
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
android:layout_weight="0"
android:visibility="gone"
android:src="@drawable/ic_clear"
android:background="@null"/>
</LinearLayout>
</RelativeLayout>

31
app/src/main/res/layout/app_details.xml
View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingLeft="6dp"
android:paddingRight="6dp">
<fragment
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/header"
android:name="org.fdroid.fdroid.AppDetails$AppDetailsHeaderFragment"
tools:layout="@layout/app_details_header" />
</FrameLayout>
<fragment
android:id="@+id/fragment_app_list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:name="org.fdroid.fdroid.AppDetails$AppDetailsListFragment" />
</LinearLayout>

178
app/src/main/res/layout/app_details_header.xml
View File

@ -1,178 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2015 Nico Alt, nicoalt@posteo.org
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 3
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/icon_and_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:orientation="horizontal"
android:padding="2dp">
<ImageView
android:id="@+id/icon"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_gravity="center_vertical"
android:contentDescription="@string/app_icon"
android:scaleType="fitCenter"
tools:src="@drawable/ic_launcher" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:baselineAligned="false"
android:orientation="vertical"
android:layout_toRightOf="@id/icon"
android:layout_toEndOf="@id/icon"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingRight="16dp"
android:paddingEnd="16dp"
>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:gravity="start"
android:singleLine="true"
android:textAlignment="viewStart"
android:textSize="17sp"
android:textStyle="bold"
tools:text="F-Droid" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:baselineAligned="false"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="3dp"
android:layout_weight="1"
android:baselineAligned="false"
android:orientation="vertical">
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:gravity="start"
android:singleLine="true"
android:textAlignment="viewStart"
android:textSize="13sp"
android:visibility="gone"
tools:text="F-Droid Authors" />
<TextView
android:id="@+id/current_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:gravity="start"
android:singleLine="true"
android:textAlignment="viewStart"
android:textSize="13sp"
tools:text="1.24" />
<TextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:gravity="start"
android:singleLine="true"
android:textAlignment="viewStart"
android:textSize="13sp"
tools:text="Version 1.23 installed" />
</LinearLayout>
<Button
android:id="@+id/btn_main"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_weight="0"
android:baselineAligned="false"
tools:text="Open" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/icon"
android:gravity="center">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1">
<ProgressBar
android:id="@+id/progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal" />
<TextView
android:id="@+id/progress_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_below="@id/progress_bar"
android:visibility="gone"
android:textSize="12sp"/>
<TextView
android:id="@+id/progress_percentage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@id/progress_bar"
android:visibility="gone"
android:textSize="12sp"/>
</RelativeLayout>
<ImageButton
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
android:layout_weight="0"
android:visibility="gone"
android:src="@drawable/ic_clear"
android:background="@null"/>
</LinearLayout>
</RelativeLayout>

233
app/src/main/res/layout/app_details_summary.xml
View File

@ -1,233 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 Nico Alt, nicoalt@posteo.org
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 3
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingLeft="@dimen/layout_horizontal_margin"
android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingRight="@dimen/layout_horizontal_margin"
android:paddingEnd="@dimen/layout_horizontal_margin"
android:paddingTop="4dp">
<TextView
android:id="@+id/summary"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textStyle="bold"
tools:text="Application manager" />
<TextView
android:id="@+id/package_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="12sp"
tools:text="org.fdroid.fdroid" />
<TextView
android:id="@+id/signature"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="12sp" />
<TextView
android:id="@+id/antifeatures"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6sp"
android:textColor="#ff0000"
android:textStyle="bold"
tools:text="Feeds you too much chocolate" />
<LinearLayout
android:id="@+id/ll_description"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:orientation="vertical">
<TextView
android:id="@+id/description"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8sp"
android:singleLine="false"
android:textSize="13sp"
tools:text="Connects to F-Droid compatible repositories. The default repo is hosted at f-droid.org, which contains only bona fide FOSS.
Android is open in the sense that you are free to install apks from anywhere you wish, but there are many good reasons for using a client/repository setup:
* Be notified when updates are available
* Keep track of older and beta versions
* Filter apps that aren't compatible with the device
* Find apps via categories and searchable descriptions
* Access associated urls for donations, source code etc.
* Stay safe by checking repo index signatures and apk hashes
Changelog" />
<TextView
android:id="@+id/view_more_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:text="@string/more"
android:textAllCaps="true"
android:textSize="14sp"
android:layout_marginTop="8dp"
android:textColor="?android:textColorSecondary"
tools:ignore="UnusedAttribute" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="2px"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="?android:attr/listDivider"
tools:ignore="PxUsage" />
<LinearLayout
android:id="@+id/ll_information"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:orientation="vertical"
tools:ignore="UnusedAttribute">
<TextView
android:id="@+id/information"
style="@style/AppDetailsSubheaderText"
android:text="@string/links"
android:drawableRight="@drawable/ic_expand_more_grey600"
android:drawableEnd="@drawable/ic_expand_more_grey600"
android:drawableLeft="@drawable/ic_website"
android:drawableStart="@drawable/ic_website" />
<LinearLayout
android:id="@+id/ll_information_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="@dimen/layout_horizontal_margin"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:visibility="gone">
<TextView
android:id="@+id/source"
style="@style/AppDetailsLink"
android:drawableLeft="@drawable/ic_source_code"
android:drawableStart="@drawable/ic_source_code"
android:text="@string/menu_source" />
<TextView
android:id="@+id/issues"
style="@style/AppDetailsLink"
android:drawableLeft="@drawable/ic_issues"
android:drawableStart="@drawable/ic_issues"
android:text="@string/menu_issues" />
<TextView
android:id="@+id/changelog"
style="@style/AppDetailsLink"
android:drawableLeft="@drawable/ic_changelog"
android:drawableStart="@drawable/ic_changelog"
android:text="@string/menu_changelog" />
<TextView
android:id="@+id/website"
style="@style/AppDetailsLink"
android:drawableLeft="@drawable/ic_website"
android:drawableStart="@drawable/ic_website"
android:text="@string/menu_website" />
<TextView
android:id="@+id/email"
style="@style/AppDetailsLink"
android:drawableLeft="@drawable/ic_email"
android:drawableStart="@drawable/ic_email"
android:text="@string/menu_email" />
<TextView
android:id="@+id/donate"
style="@style/AppDetailsLink"
android:drawableLeft="@drawable/ic_donate"
android:drawableStart="@drawable/ic_donate"
android:text="@string/menu_donate" />
<TextView
android:id="@+id/bitcoin"
style="@style/AppDetailsLink"
android:drawableLeft="@drawable/ic_bitcoin"
android:drawableStart="@drawable/ic_bitcoin"
android:text="@string/menu_bitcoin" />
<TextView
android:id="@+id/litecoin"
style="@style/AppDetailsLink"
android:drawableLeft="@drawable/donation_option_litecoin"
android:drawableStart="@drawable/donation_option_litecoin"
android:text="@string/menu_litecoin" />
<TextView
android:id="@+id/flattr"
style="@style/AppDetailsLink"
android:drawableLeft="@drawable/donation_option_flattr"
android:drawableStart="@drawable/donation_option_flattr"
android:text="@string/menu_flattr" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_permissions"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:orientation="vertical"
android:layout_marginBottom="8dp"
tools:ignore="UnusedAttribute">
<TextView
android:id="@+id/permissions"
style="@style/AppDetailsSubheaderText"
android:text="@string/permissions"
android:drawableLeft="@drawable/ic_lock_24dp_grey600"
android:drawableStart="@drawable/ic_lock_24dp_grey600"
android:drawableRight="@drawable/ic_expand_more_grey600"
android:drawableEnd="@drawable/ic_expand_more_grey600" />
<LinearLayout
android:id="@+id/permission_list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:fontFamily="sans-serif-light"
android:textSize="14sp"
android:visibility="gone"
android:paddingEnd="4dp"
android:paddingRight="4dp"
tools:ignore="RtlSymmetry" />
</LinearLayout>
</LinearLayout>