* Changed Activity Label/Launcher Text

* Build Events to "activate" matching Manifest
This commit is contained in:
PhilippC 2013-02-27 22:11:44 +01:00
parent c6d2e26682
commit 049d4d9030
6 changed files with 35 additions and 14 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/src/keepass2android/bin /src/keepass2android/bin
/src/KeePassLib2Android/bin /src/KeePassLib2Android/bin
/src/KeePass.userprefs /src/KeePass.userprefs
/src/keepass2android/Properties/AndroidManifest.xml

View File

@ -27,8 +27,9 @@ using keepass2android.view;
namespace keepass2android namespace keepass2android
{ {
[Activity (Label = "@string/app_name", MainLauncher = true, Theme="@style/Base")] [Activity (Label = AppNames.AppName, MainLauncher = true, Theme="@style/Base")]
[IntentFilter (new[]{Intent.ActionView}, [IntentFilter (new[]{Intent.ActionView},
Label=AppNames.AppLauncherTitle,
DataScheme="file", DataScheme="file",
DataMimeType="*/*", DataMimeType="*/*",
DataHost="*", DataHost="*",

View File

@ -0,0 +1,2 @@
echo hallo!
copy Properties\AndroidManifest_net.xml Properties\AndroidManifest.xml

View File

@ -0,0 +1,2 @@
echo hallo!
copy Properties\AndroidManifest_nonet.xml Properties\AndroidManifest.xml

View File

@ -29,26 +29,30 @@ using Android.Widget;
namespace keepass2android namespace keepass2android
{ {
public static class AppNameResolver #if NoNet
public static class AppNames
{ {
public static string AppName public const string AppName = "@string/app_name_nonet";
public const string AppNameShort = "@string/short_app_name_nonet";
public const string AppLauncherTitle = "@string/short_app_name_nonet";
}
#else
public static class AppNames
{ {
get { return "@string/app_name";} public const string AppName = "@string/app_name";
} public const string AppNameShort = "@string/short_app_name";
public static string AppNameShort public const string AppLauncherTitle = "@string/app_name";
{
get { return "@string/app_name_short";}
}
} }
#endif
///Application class for Keepass2Android: Contains static Database variable to be used by all components. ///Application class for Keepass2Android: Contains static Database variable to be used by all components.
#if NoNet #if NoNet
[Application(Debuggable=false, Label=AppNameResolver.AppName)] [Application(Debuggable=false, Label=AppNames.AppName)]
#else #else
#if RELEASE #if RELEASE
[Application(Debuggable=false, Label="@string/app_name")] [Application(Debuggable=false, Label=AppNames.AppName)]
#else #else
[Application(Debuggable=true, Label="@string/app_name")] [Application(Debuggable=true, Label=AppNames.AppName)]
#endif #endif
#endif #endif
public class App : Application { public class App : Application {

View File

@ -41,6 +41,11 @@
<DeployExternal>True</DeployExternal> <DeployExternal>True</DeployExternal>
<AndroidLinkMode>SdkOnly</AndroidLinkMode> <AndroidLinkMode>SdkOnly</AndroidLinkMode>
<AndroidSupportedAbis>armeabi,armeabi-v7a</AndroidSupportedAbis> <AndroidSupportedAbis>armeabi,armeabi-v7a</AndroidSupportedAbis>
<CustomCommands>
<CustomCommands>
<Command type="BeforeBuild" command="UseManifestNet.bat" />
</CustomCommands>
</CustomCommands>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU' ">
<DebugType>none</DebugType> <DebugType>none</DebugType>
@ -51,6 +56,12 @@
<AndroidLinkMode>SdkOnly</AndroidLinkMode> <AndroidLinkMode>SdkOnly</AndroidLinkMode>
<DefineConstants>NoNet</DefineConstants> <DefineConstants>NoNet</DefineConstants>
<DeployExternal>True</DeployExternal> <DeployExternal>True</DeployExternal>
<CustomCommands>
<CustomCommands>
<Command type="BeforeBuild" command="UseManifestNoNet.bat" workingdir="" />
</CustomCommands>
</CustomCommands>
<AndroidSupportedAbis>armeabi,armeabi-v7a</AndroidSupportedAbis>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />