2013-11-03 16:12:22 +01:00
<resources xmlns:android= "http://schemas.android.com/apk/res/android" >
2014-06-03 08:13:53 +09:30
<style name= "AppBaseThemeDark" parent= "Theme.AppCompat" >
2013-11-03 16:12:22 +01:00
<!-- backward - compatibility theme options go here -->
</style>
2014-05-27 06:30:09 +09:30
<style name= "AppBaseThemeLight" parent= "Theme.AppCompat.Light" >
<!-- backward - compatibility theme options go here -->
</style>
<style name= "AppBaseThemeLightWithDarkActionBar" parent= "Theme.AppCompat.Light.DarkActionBar" >
2013-11-03 16:12:22 +01:00
<!-- backward - compatibility theme options go here -->
</style>
2014-12-30 11:48:20 +11:00
<color name= "black" > #FF000000</color>
<color name= "white" > #FFFFFFFF</color>
<color name= "red" > #FFFF0000</color>
2013-11-03 16:12:22 +01:00
2014-12-30 11:48:20 +11:00
<style name= "AboutDialogLight" parent= "@android:style/Theme.Dialog" >
<item name= "@android:windowBackground" > @color/black</item>
<item name= "@android:textColor" > @color/white</item>
</style>
2013-11-03 16:12:22 +01:00
<style name= "AppThemeDark" parent= "AppBaseThemeDark" >
<!-- customizations that are not API - level specific go here. -->
</style>
<style name= "AppThemeLight" parent= "AppBaseThemeLight" >
<!-- customizations that are not API - level specific go here. -->
</style>
2014-05-27 06:30:09 +09:30
<style name= "AppThemeLightWithDarkActionBar" parent= "AppBaseThemeLightWithDarkActionBar" >
<!-- customizations that are not API - level specific go here. -->
</style>
2014-08-19 15:37:44 +09:30
<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>
<item name= "android:actionButtonStyle" > @style/SwapTheme.Wizard.ActionButton</item>
</style>
2014-08-14 20:31:18 +09:30
<style name= "SwapTheme.StartSwap" parent= "AppThemeLightWithDarkActionBar" >
2014-06-20 21:44:42 +09:30
<item name= "android:background" > @color/white</item>
2014-08-19 15:37:44 +09:30
</style>
2014-08-14 20:31:18 +09:30
<style name= "SwapTheme.AppList" parent= "AppThemeLightWithDarkActionBar" >
</style>
2014-08-08 00:15:52 +09:30
<style name= "SwapTheme.AppList.ListItem" parent= "AppThemeLightWithDarkActionBar" >
</style>
2014-08-14 20:31:18 +09:30
<style name= "SwapTheme.StartSwap.StartButton" >
2014-08-19 15:37:44 +09:30
<item name= "android:layout_marginLeft" > 9dp</item> <!-- 16px * 96dpi / 160dpi -->
<item name= "android:layout_marginRight" > 9dp</item> <!-- 16px * 96dpi / 160dpi -->
<item name= "android:layout_height" > 63.3dp</item> <!-- 113px * 96dpi / 160dpi -->
<item name= "android:layout_width" > match_parent</item>
<item name= "android:textSize" > 18.5sp</item> <!-- 33px * 96dpi / 160dpi -->
<item name= "android:background" > @drawable/swap_start_button_skin</item>
<item name= "android:textColor" > #fff</item>
<item name= "android:drawableLeft" > @drawable/ic_swap</item>
<item name= "android:paddingLeft" > 10dp</item>
</style>
2014-08-14 20:31:18 +09:30
<style name= "SwapTheme.AppList.SwapSuccess" >
<item name= "android:textAlignment" > center</item>
2014-12-30 11:48:20 +11:00
<item name= "android:gravity" > center</item>
2014-08-14 20:31:18 +09:30
<item name= "android:textSize" > 25.7sp</item> <!-- 46px * 96dpi / 160dpi -->
<item name= "android:paddingTop" > 28dp</item> <!-- 50px * 96dpi / 160dpi -->
<item name= "android:paddingBottom" > 20.1dp</item> <!-- 36px * 96dpi / 160dpi -->
<item name= "android:fontFamily" > sans-serif-light</item>
</style>
<style name= "SwapTheme.AppList.SwapSuccessDetails" >
<item name= "android:textAlignment" > center</item>
2014-12-30 11:48:20 +11:00
<item name= "android:gravity" > center</item>
2014-08-14 20:31:18 +09:30
<item name= "android:textSize" > 20.1sp</item> <!-- 36px * 96dpi / 160dpi -->
<item name= "android:paddingTop" > 20.1dp</item> <!-- 36px * 96dpi / 160dpi -->
<item name= "android:paddingBottom" > 20.1dp</item> <!-- 36px * 96dpi / 160dpi -->
<item name= "android:textStyle" > bold</item>
</style>
<style name= "SwapTheme.StartSwap.MainText" >
2014-08-19 15:37:44 +09:30
<item name= "android:textAlignment" > center</item>
2014-12-30 11:48:20 +11:00
<item name= "android:gravity" > center</item>
2014-08-19 15:37:44 +09:30
<item name= "android:textSize" > 20.1sp</item> <!-- 36px * 96dpi / 160dpi -->
<item name= "android:paddingLeft" > 28dp</item> <!-- 50px * 96dpi / 160dpi -->
<item name= "android:paddingRight" > 28dp</item> <!-- 50px * 96dpi / 160dpi -->
<item name= "android:paddingTop" > 28dp</item> <!-- 50px * 96dpi / 160dpi -->
<item name= "android:paddingBottom" > 16.8dp</item> <!-- 30px * 96dpi / 160dpi -->
</style>
<style name= "SwapTheme.Wizard.Text" >
<item name= "android:textAlignment" > center</item>
2014-12-30 11:48:20 +11:00
<item name= "android:gravity" > center</item>
2014-08-19 15:37:44 +09:30
<item name= "android:textColor" > #fff</item>
<item name= "android:textColorPrimary" > #fff</item>
<item name= "android:textColorSecondary" > #fff</item>
</style>
<style name= "SwapTheme.Wizard.ActionButton" parent= "Widget.AppCompat.ActionButton" >
<item name= "android:textAppearance" > @style/SwapTheme.Wizard.Text</item>
<item name= "android:paddingLeft" > 10dp</item>
<item name= "android:paddingRight" > 10dp</item>
<item name= "android:paddingTop" > 5dp</item>
<item name= "android:paddingBottom" > 5dp</item>
<item name= "android:background" > @drawable/swap_action_button_skin</item>
</style>
<style name= "SwapTheme.Wizard.MainText" parent= "@style/SwapTheme.Wizard.Text" >
<item name= "android:paddingLeft" > 40dp</item>
<item name= "android:paddingRight" > 40dp</item>
<item name= "android:paddingTop" > 39.3dp</item> <!-- 70px * 96dpi / 160dpi -->
<item name= "android:paddingBottom" > 29.25dp</item> <!-- 52px * 96dpi / 160dpi -->
<item name= "android:fontFamily" > sans-serif-light</item>
</style>
<style name= "SwapTheme.Wizard.LocalIpAddress" parent= "@style/SwapTheme.Wizard.Text" >
2014-09-04 19:02:57 +09:30
<item name= "android:textSize" > 26.5sp</item> <!-- 58px * 96dpi / 160dpi = 32.5sp (ended up making a bit smaller, because longer addresses didn't fit well) -->
2014-08-19 15:37:44 +09:30
<item name= "android:paddingLeft" > 40dp</item>
<item name= "android:paddingRight" > 40dp</item>
<item name= "android:paddingTop" > 22.5dp</item> <!-- 40px * 96dpi / 160dpi -->
<item name= "android:paddingBottom" > 42.5dp</item> <!-- 75px * 96dpi / 160dpi -->
<item name= "android:textStyle" > bold</item>
</style>
<style name= "SwapTheme.Wizard.WifiSSID" parent= "@style/SwapTheme.Wizard.Text" >
<item name= "android:textSize" > 26sp</item> <!-- 46px * 96dpi / 160dpi -->
<item name= "android:paddingLeft" > 40dp</item>
<item name= "android:paddingRight" > 40dp</item>
<item name= "android:paddingTop" > 20dp</item>
<item name= "android:paddingBottom" > 5dp</item>
<item name= "android:textStyle" > bold</item>
</style>
Implemented client connection for swap.
Listen for a new intent, show a screen to the user mentioning
they are about to start a swap. Make FDroid receive repo intents,
then dispatch to relevant Activity.
Previously manage repo always got the intents. Now FDroid does, and
chooses whether to give to ManageRepos or Client connect.
Not sure if it is required to do it this way or not, but it seems to
work.
I had a bit of an issue getting the "Welcome to F-Droid" string to
fit on one line, because it was breaking on the hyphen. That is still
not resolved in this commit.
Still need to:
* Show error messages instead of the "connect" description
* Jar signing seems not to work when connecting to other repo.
In order to handle returning to F-Droid after connecting (or saying no)
I tagged the intent with a "handled" extra value. That way, I can ignore
trying to connect to a repo if we've already handled that event.
Finally, I also fixed an issue regarding downloading of signed
index.jar files with an uppercase fingerprint.
The fingerprint from the jar differed from that in the swap url,
in that one was upper case and the other was lower case.
This uses an .equalsIgnoreCase check instead. It also adds an
extra guard in case the repo doesn't have a fingerprint. Although
it may not even use the signed repo updater if both the pubkey
and fingerprint are null, it is nice to have the extra assurance.
Fixes issue #19.
I also left some more TODO's around. I should put them in issues,
but I'm in a bit of a hurry.
2014-07-05 07:49:37 +09:30
<style name= "SwapTheme.Wizard.ButtonBase" >
2014-08-19 15:37:44 +09:30
<item name= "android:layout_width" > match_parent</item>
<item name= "android:layout_height" > wrap_content</item>
<item name= "android:padding" > 19dp</item> <!-- 34px * 96dpi / 160dpi -->
<item name= "android:textSize" > 20.25sp</item> <!-- 36px * 96dpi / 160dpi -->
<item name= "android:textColor" > #fff</item>
<item name= "android:fontFamily" > sans-serif-light</item>
Implemented client connection for swap.
Listen for a new intent, show a screen to the user mentioning
they are about to start a swap. Make FDroid receive repo intents,
then dispatch to relevant Activity.
Previously manage repo always got the intents. Now FDroid does, and
chooses whether to give to ManageRepos or Client connect.
Not sure if it is required to do it this way or not, but it seems to
work.
I had a bit of an issue getting the "Welcome to F-Droid" string to
fit on one line, because it was breaking on the hyphen. That is still
not resolved in this commit.
Still need to:
* Show error messages instead of the "connect" description
* Jar signing seems not to work when connecting to other repo.
In order to handle returning to F-Droid after connecting (or saying no)
I tagged the intent with a "handled" extra value. That way, I can ignore
trying to connect to a repo if we've already handled that event.
Finally, I also fixed an issue regarding downloading of signed
index.jar files with an uppercase fingerprint.
The fingerprint from the jar differed from that in the swap url,
in that one was upper case and the other was lower case.
This uses an .equalsIgnoreCase check instead. It also adds an
extra guard in case the repo doesn't have a fingerprint. Although
it may not even use the signed repo updater if both the pubkey
and fingerprint are null, it is nice to have the extra assurance.
Fixes issue #19.
I also left some more TODO's around. I should put them in issues,
but I'm in a bit of a hurry.
2014-07-05 07:49:37 +09:30
</style>
<!--
Buttons down the bottom of the screen, which prompt the user for further
info, or to change the process somehow (e.g. Use Bluetooth instead of Wifi).
-->
<style name= "SwapTheme.Wizard.OptionButton" parent= "SwapTheme.Wizard.ButtonBase" >
<item name= "android:background" > @drawable/swap_button_skin</item>
2014-08-19 15:37:44 +09:30
<item name= "android:layout_margin" > 0dp</item>
</style>
Implemented client connection for swap.
Listen for a new intent, show a screen to the user mentioning
they are about to start a swap. Make FDroid receive repo intents,
then dispatch to relevant Activity.
Previously manage repo always got the intents. Now FDroid does, and
chooses whether to give to ManageRepos or Client connect.
Not sure if it is required to do it this way or not, but it seems to
work.
I had a bit of an issue getting the "Welcome to F-Droid" string to
fit on one line, because it was breaking on the hyphen. That is still
not resolved in this commit.
Still need to:
* Show error messages instead of the "connect" description
* Jar signing seems not to work when connecting to other repo.
In order to handle returning to F-Droid after connecting (or saying no)
I tagged the intent with a "handled" extra value. That way, I can ignore
trying to connect to a repo if we've already handled that event.
Finally, I also fixed an issue regarding downloading of signed
index.jar files with an uppercase fingerprint.
The fingerprint from the jar differed from that in the swap url,
in that one was upper case and the other was lower case.
This uses an .equalsIgnoreCase check instead. It also adds an
extra guard in case the repo doesn't have a fingerprint. Although
it may not even use the signed repo updater if both the pubkey
and fingerprint are null, it is nice to have the extra assurance.
Fixes issue #19.
I also left some more TODO's around. I should put them in issues,
but I'm in a bit of a hurry.
2014-07-05 07:49:37 +09:30
<style name= "SwapTheme.Wizard.ReceiveSwap" parent= "SwapTheme.Wizard" >
<item name= "android:windowNoTitle" > true</item>
<item name= "android:windowFullscreen" > true</item>
</style>
<!--
Buttons used to ask the user to confirm they want to receive a swap repo from someone
-->
<style name= "SwapTheme.Wizard.ReceiveSwap.ButtonBase" parent= "SwapTheme.Wizard.ButtonBase" >
<item name= "android:layout_width" > 0dp</item>
</style>
<style name= "SwapTheme.Wizard.ReceiveSwap.Confirm" parent= "SwapTheme.Wizard.ReceiveSwap.ButtonBase" >
<item name= "android:background" > @drawable/swap_confirm_button_skin</item>
<item name= "android:layout_marginLeft" > 7dp</item>
</style>
<style name= "SwapTheme.Wizard.ReceiveSwap.Deny" parent= "SwapTheme.Wizard.ReceiveSwap.ButtonBase" >
<item name= "android:background" > @drawable/swap_deny_button_skin</item>
<item name= "android:layout_marginRight" > 7dp</item>
</style>
<style name= "SwapTheme.Wizard.ReceiveSwap.MainText" parent= "SwapTheme.Wizard.MainText" >
<item name= "android:textSize" > 33.6sp</item> <!-- 60 * 96dpi / 160dpi -->
<item name= "android:textStyle" > italic</item>
</style>
2013-11-03 16:12:22 +01:00
</resources>