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

Merge branch 'master' of https://gitlab.com/relan/fdroidclient

Browse Source
This commit is contained in:
Daniel Martí 2015-07-24 10:21:08 -07:00
commit 17b6ca83d7
14 changed files with 59 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,12 +2,11 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingLeft="8dp"
android:paddingStart="8dp"
android:paddingRight="8dp"
android:paddingEnd="8dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="24dp"
android:paddingEnd="24dp"
android:paddingTop="20dp"
android:baselineAligned="false"
android:orientation="vertical">

6
F-Droid/res/layout/addrepo.xml
View File

@ -3,7 +3,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="6dp">
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="24dp"
android:paddingEnd="24dp"
android:paddingTop="20dp">
<LinearLayout
android:id="@+id/add_repo_form"

11
F-Droid/res/layout/repodiscoverylist.xml
View File

@ -1,12 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent"
android:paddingLeft="24dp"
android:paddingStart="24dp"
android:paddingRight="24dp"
android:paddingEnd="24dp"
android:paddingTop="20dp" >
<LinearLayout
android:id="@+id/reposcanprogresslayout"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
@ -42,4 +47,4 @@
android:padding="8sp"
/>
</RelativeLayout>
</RelativeLayout>

14
F-Droid/res/values-v11/styles.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AlertDialogBaseThemeDark" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
</style>
<style name="AlertDialogBaseThemeLight" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
</style>
</resources>

4
F-Droid/res/values-v21/styles.xml
View File

@ -3,6 +3,7 @@
<style name="AppThemeDark" parent="AppBaseThemeDark">
<!-- customizations that are not API-level specific go here. -->
<item name="android:alertDialogTheme">@style/AlertDialogThemeDark</item>
<item name="android:colorEdgeEffect">@color/fdroid_blue</item>
<item name="android:colorControlActivated">@color/fdroid_green</item>
<item name="android:colorControlHighlight">@color/fdroid_green</item>
@ -10,7 +11,8 @@
<style name="AppThemeLight" parent="AppBaseThemeLight">
<!-- customizations that are not API-level specific go here. -->
<item name="android:alertDialogTheme">@style/AlertDialogThemeLight</item>
<item name="android:colorEdgeEffect">@color/fdroid_blue</item>
</style>
</resources>
</resources>

19
F-Droid/res/values/styles.xml
View File

@ -6,6 +6,8 @@
<item name="colorPrimary">@color/fdroid_blue</item>
<item name="colorPrimaryDark">@color/fdroid_blue_dark</item>
<item name="colorAccent">@color/fdroid_green</item>
<item name="android:textColorLink">@color/fdroid_green</item>
<item name="alertDialogTheme">@style/AlertDialogThemeDark</item>
</style>
<style name="AppBaseThemeLight" parent="Theme.AppCompat.Light.DarkActionBar">
@ -14,17 +16,14 @@
<item name="colorPrimary">@color/fdroid_blue</item>
<item name="colorPrimaryDark">@color/fdroid_blue_dark</item>
<item name="colorAccent">@color/fdroid_green</item>
<item name="android:textColorLink">@color/fdroid_green</item>
<item name="alertDialogTheme">@style/AlertDialogThemeLight</item>
</style>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="red">#FFFF0000</color>
<style name="AboutDialogLight" parent="@android:style/Theme.Dialog">
<item name="@android:windowBackground">@color/black</item>
<item name="@android:textColor">@color/white</item>
</style>
<style name="AppThemeDark" parent="AppBaseThemeDark">
<!-- customizations that are not API-level specific go here. -->
</style>
@ -33,6 +32,16 @@
<!-- customizations that are not API-level specific go here. -->
</style>
<style name="AlertDialogBaseThemeDark" parent="Theme.AppCompat.Dialog.Alert" />
<style name="AlertDialogThemeDark" parent="AlertDialogBaseThemeDark">
<item name="colorAccent">@color/fdroid_green</item>
</style>
<style name="AlertDialogBaseThemeLight" parent="Theme.AppCompat.Light.Dialog.Alert" />
<style name="AlertDialogThemeLight" parent="AlertDialogBaseThemeLight">
<item name="colorAccent">@color/fdroid_green</item>
</style>
<style name="SwapTheme.Wizard" parent="AppThemeDark">
<item name="android:windowBackground">@drawable/swap_window_background</item>
<item name="android:actionBarStyle">@style/Widget.AppCompat.ActionBar.Solid</item>

2
F-Droid/src/org/fdroid/fdroid/AppDetails.java
View File

@ -21,7 +21,6 @@
package org.fdroid.fdroid;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.bluetooth.BluetoothAdapter;
import android.content.ActivityNotFoundException;
@ -43,6 +42,7 @@ import android.support.v4.app.ListFragment;
import android.support.v4.app.NavUtils;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AlertDialog;
import android.text.Html;
import android.text.Layout;
import android.text.Selection;

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

@ -19,7 +19,6 @@
package org.fdroid.fdroid;
import android.app.AlertDialog;
import android.app.NotificationManager;
import android.app.SearchManager;
import android.bluetooth.BluetoothAdapter;
@ -30,13 +29,12 @@ import android.content.pm.PackageInfo;
import android.content.res.Configuration;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.view.ViewPager;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AlertDialog;
import android.text.TextUtils;
import android.util.Log;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -279,16 +277,7 @@ public class FDroid extends ActionBarActivity {
return true;
case R.id.action_about:
View view;
if (Build.VERSION.SDK_INT >= 11) {
LayoutInflater li = LayoutInflater.from(this);
view = li.inflate(R.layout.about, null);
} else {
view = View.inflate(
new ContextThemeWrapper(this, R.style.AboutDialogLight),
R.layout.about, null);
}
View view = LayoutInflater.from(this).inflate(R.layout.about, null);
// Fill in the version...
try {
PackageInfo pi = getPackageManager()
@ -299,15 +288,7 @@ public class FDroid extends ActionBarActivity {
} catch (Exception ignored) {
}
AlertDialog.Builder builder;
if (Build.VERSION.SDK_INT >= 11) {
builder = new AlertDialog.Builder(this).setView(view);
} else {
builder = new AlertDialog.Builder(
new ContextThemeWrapper(
this, R.style.AboutDialogLight)
).setView(view);
}
AlertDialog.Builder builder = new AlertDialog.Builder(this).setView(view);
final AlertDialog alrt = builder.create();
alrt.setTitle(getString(R.string.about_title));
alrt.setButton(AlertDialog.BUTTON_NEUTRAL,

2
F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java
View File

@ -18,7 +18,6 @@
package org.fdroid.fdroid.installer;
import android.annotation.TargetApi;
import android.app.AlertDialog;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
@ -29,6 +28,7 @@ import android.content.pm.PermissionInfo;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Parcel;
import android.support.v7.app.AlertDialog;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.util.AttributeSet;

2
F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java
View File

@ -20,7 +20,6 @@
package org.fdroid.fdroid.installer;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
@ -32,6 +31,7 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.NotificationCompat;
import android.support.v7.app.AlertDialog;
import android.text.Html;
import android.util.Log;
import android.view.ContextThemeWrapper;

2
F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java
View File

@ -21,7 +21,6 @@
package org.fdroid.fdroid.installer;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
@ -30,6 +29,7 @@ import android.content.pm.IPackageInstallObserver;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.RemoteException;
import android.support.v7.app.AlertDialog;
import android.util.Log;
import org.fdroid.fdroid.R;

2
F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
View File

@ -19,7 +19,6 @@
package org.fdroid.fdroid.views;
import android.app.AlertDialog;
import android.content.ContentValues;
import android.content.Context;
import android.content.DialogInterface;
@ -42,6 +41,7 @@ import android.support.v4.app.NavUtils;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AlertDialog;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;

2
F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
View File

@ -1,6 +1,5 @@
package org.fdroid.fdroid.views.fragments;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
@ -11,6 +10,7 @@ import android.preference.EditTextPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.support.v4.preference.PreferenceFragment;
import android.support.v7.app.AlertDialog;
import android.text.Html;
import android.text.TextUtils;

2
F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
View File

@ -2,7 +2,6 @@ package org.fdroid.fdroid.views.fragments;
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.ContentValues;
import android.content.DialogInterface;
import android.content.Intent;
@ -11,6 +10,7 @@ import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.app.AlertDialog;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;