Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
BobStore/res/layout/swap_wifi_qr.xml

50 lines
2.1 KiB
XML
Raw Normal View History

Beginnings of an implementation for Swap. The Fragments and an Activity which tie all of the swap views together has begun. The first bit of implementation is to get the current wifi network displayed, which worked out alright. This commit contains a lot of theme related stuff, particularly involving taking assets from carries mockups and making them suitable to use as drawables. The process for doing this is a story for another day, but I'll document it and put it on the wiki in the future. carrie showed me a script that a mate of hers used on another project, and I've adapted it a little to make it work nicely here (note - it isn't in this commit). The button is blue, and always shown with associated text in the ActionBar. This required a custom drawable which was set as the background in the styles.xml.
2014-08-19 15:37:44 +09:30
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/textView"
android:layout_gravity="center_horizontal"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
Moved code from LocalRepo to the Swap UI to reuse it. Along with a bunch of networking stuff, a lot of UI to do with selecting apps to swap was also moved. The background on the list is transparent, which allows blue to shine through. Also, the text on the list items is white, which will not work with a white background. I've temporarily dropped support for searching this list too, until I get some feedback from carrie et al. NOTE: This stuff was written before hans fixed apcompat problems with LocalRepoActivity, but then rebased over it later. As such, it doesn't contain his fixes. Will need to do that before a stable release. i.e. Still has a bit of a dependency on API 11 which needs to be resolved.
2014-06-20 21:44:42 +09:30
android:text="One person needs to scan the code, or type the URL of the other swapper into a browser."
Beginnings of an implementation for Swap. The Fragments and an Activity which tie all of the swap views together has begun. The first bit of implementation is to get the current wifi network displayed, which worked out alright. This commit contains a lot of theme related stuff, particularly involving taking assets from carries mockups and making them suitable to use as drawables. The process for doing this is a story for another day, but I'll document it and put it on the wiki in the future. carrie showed me a script that a mate of hers used on another project, and I've adapted it a little to make it work nicely here (note - it isn't in this commit). The button is blue, and always shown with associated text in the ActionBar. This required a custom drawable which was set as the background in the styles.xml.
2014-08-19 15:37:44 +09:30
style="@style/SwapTheme.Wizard.MainText"/>
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/wifi_qr_code"
tools:src="@drawable/swap_qr_example"
Moved code from LocalRepo to the Swap UI to reuse it. Along with a bunch of networking stuff, a lot of UI to do with selecting apps to swap was also moved. The background on the list is transparent, which allows blue to shine through. Also, the text on the list items is white, which will not work with a white background. I've temporarily dropped support for searching this list too, until I get some feedback from carrie et al. NOTE: This stuff was written before hans fixed apcompat problems with LocalRepoActivity, but then rebased over it later. As such, it doesn't contain his fixes. Will need to do that before a stable release. i.e. Still has a bit of a dependency on API 11 which needs to be resolved.
2014-06-20 21:44:42 +09:30
android:layout_below="@+id/textView"
android:layout_above="@+id/device_ip_address"/>
Beginnings of an implementation for Swap. The Fragments and an Activity which tie all of the swap views together has begun. The first bit of implementation is to get the current wifi network displayed, which worked out alright. This commit contains a lot of theme related stuff, particularly involving taking assets from carries mockups and making them suitable to use as drawables. The process for doing this is a story for another day, but I'll document it and put it on the wiki in the future. carrie showed me a script that a mate of hers used on another project, and I've adapted it a little to make it work nicely here (note - it isn't in this commit). The button is blue, and always shown with associated text in the ActionBar. This required a custom drawable which was set as the background in the styles.xml.
2014-08-19 15:37:44 +09:30
Make "Open QR scanner" button work for swap connect screen. I did the same as some previous code which copied code from the zxing library and put it in the com.google.zxing namespace (but left the license in tact - is this okay for Apache 2.0 stuff?). The reason was that they encourage copying the relevant two files into your project and modifying as neccesary. In this case, it wasn't about modifying for functionalities sake, but rather for android support libraries sake. The upstream version doesn't support android.support.v4.app.Fragments, only android.app.Fragments. Hooking up the intent integrator from zxing almost removes the need for the refactoring which made FDroid.java responsible for handling "new repo" intents. However, there is still the one case of the user not using the QR code, but rather a web browser to connect to a swap. That is, they will click a link on the other phones web browser, which directs them to initiate the swap. Thus, we still need FDroid.java to be able to distinguish between a "swap" new repo request, and a regular "add repo" new repo request. In the process, I also commented out the "It's not working" button.
2014-08-04 08:02:12 +09:30
<!--
Beginnings of an implementation for Swap. The Fragments and an Activity which tie all of the swap views together has begun. The first bit of implementation is to get the current wifi network displayed, which worked out alright. This commit contains a lot of theme related stuff, particularly involving taking assets from carries mockups and making them suitable to use as drawables. The process for doing this is a story for another day, but I'll document it and put it on the wiki in the future. carrie showed me a script that a mate of hers used on another project, and I've adapted it a little to make it work nicely here (note - it isn't in this commit). The button is blue, and always shown with associated text in the ActionBar. This required a custom drawable which was set as the background in the styles.xml.
2014-08-19 15:37:44 +09:30
<Button style="@style/SwapTheme.Wizard.OptionButton"
android:id="@+id/btn_not_working"
Moved code from LocalRepo to the Swap UI to reuse it. Along with a bunch of networking stuff, a lot of UI to do with selecting apps to swap was also moved. The background on the list is transparent, which allows blue to shine through. Also, the text on the list items is white, which will not work with a white background. I've temporarily dropped support for searching this list too, until I get some feedback from carrie et al. NOTE: This stuff was written before hans fixed apcompat problems with LocalRepoActivity, but then rebased over it later. As such, it doesn't contain his fixes. Will need to do that before a stable release. i.e. Still has a bit of a dependency on API 11 which needs to be resolved.
2014-06-20 21:44:42 +09:30
android:text="@string/swap_wifi_qr_not_working"
Beginnings of an implementation for Swap. The Fragments and an Activity which tie all of the swap views together has begun. The first bit of implementation is to get the current wifi network displayed, which worked out alright. This commit contains a lot of theme related stuff, particularly involving taking assets from carries mockups and making them suitable to use as drawables. The process for doing this is a story for another day, but I'll document it and put it on the wiki in the future. carrie showed me a script that a mate of hers used on another project, and I've adapted it a little to make it work nicely here (note - it isn't in this commit). The button is blue, and always shown with associated text in the ActionBar. This required a custom drawable which was set as the background in the styles.xml.
2014-08-19 15:37:44 +09:30
android:layout_alignParentBottom="true" />
Make "Open QR scanner" button work for swap connect screen. I did the same as some previous code which copied code from the zxing library and put it in the com.google.zxing namespace (but left the license in tact - is this okay for Apache 2.0 stuff?). The reason was that they encourage copying the relevant two files into your project and modifying as neccesary. In this case, it wasn't about modifying for functionalities sake, but rather for android support libraries sake. The upstream version doesn't support android.support.v4.app.Fragments, only android.app.Fragments. Hooking up the intent integrator from zxing almost removes the need for the refactoring which made FDroid.java responsible for handling "new repo" intents. However, there is still the one case of the user not using the QR code, but rather a web browser to connect to a swap. That is, they will click a link on the other phones web browser, which directs them to initiate the swap. Thus, we still need FDroid.java to be able to distinguish between a "swap" new repo request, and a regular "add repo" new repo request. In the process, I also commented out the "It's not working" button.
2014-08-04 08:02:12 +09:30
-->
Beginnings of an implementation for Swap. The Fragments and an Activity which tie all of the swap views together has begun. The first bit of implementation is to get the current wifi network displayed, which worked out alright. This commit contains a lot of theme related stuff, particularly involving taking assets from carries mockups and making them suitable to use as drawables. The process for doing this is a story for another day, but I'll document it and put it on the wiki in the future. carrie showed me a script that a mate of hers used on another project, and I've adapted it a little to make it work nicely here (note - it isn't in this commit). The button is blue, and always shown with associated text in the ActionBar. This required a custom drawable which was set as the background in the styles.xml.
2014-08-19 15:37:44 +09:30
<Button style="@style/SwapTheme.Wizard.OptionButton"
Moved code from LocalRepo to the Swap UI to reuse it. Along with a bunch of networking stuff, a lot of UI to do with selecting apps to swap was also moved. The background on the list is transparent, which allows blue to shine through. Also, the text on the list items is white, which will not work with a white background. I've temporarily dropped support for searching this list too, until I get some feedback from carrie et al. NOTE: This stuff was written before hans fixed apcompat problems with LocalRepoActivity, but then rebased over it later. As such, it doesn't contain his fixes. Will need to do that before a stable release. i.e. Still has a bit of a dependency on API 11 which needs to be resolved.
2014-06-20 21:44:42 +09:30
android:text="@string/open_qr_code_scanner"
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
android:layout_gravity="center"
Make "Open QR scanner" button work for swap connect screen. I did the same as some previous code which copied code from the zxing library and put it in the com.google.zxing namespace (but left the license in tact - is this okay for Apache 2.0 stuff?). The reason was that they encourage copying the relevant two files into your project and modifying as neccesary. In this case, it wasn't about modifying for functionalities sake, but rather for android support libraries sake. The upstream version doesn't support android.support.v4.app.Fragments, only android.app.Fragments. Hooking up the intent integrator from zxing almost removes the need for the refactoring which made FDroid.java responsible for handling "new repo" intents. However, there is still the one case of the user not using the QR code, but rather a web browser to connect to a swap. That is, they will click a link on the other phones web browser, which directs them to initiate the swap. Thus, we still need FDroid.java to be able to distinguish between a "swap" new repo request, and a regular "add repo" new repo request. In the process, I also commented out the "It's not working" button.
2014-08-04 08:02:12 +09:30
android:layout_alignParentBottom="true"
android:id="@+id/btn_qr_scanner"/>
<!-- android:layout_above="@id/btn_not_working" -->
Beginnings of an implementation for Swap. The Fragments and an Activity which tie all of the swap views together has begun. The first bit of implementation is to get the current wifi network displayed, which worked out alright. This commit contains a lot of theme related stuff, particularly involving taking assets from carries mockups and making them suitable to use as drawables. The process for doing this is a story for another day, but I'll document it and put it on the wiki in the future. carrie showed me a script that a mate of hers used on another project, and I've adapted it a little to make it work nicely here (note - it isn't in this commit). The button is blue, and always shown with associated text in the ActionBar. This required a custom drawable which was set as the background in the styles.xml.
2014-08-19 15:37:44 +09:30
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/device_ip_address"
tools:text="192.168.1.1:8888"
Make "Open QR scanner" button work for swap connect screen. I did the same as some previous code which copied code from the zxing library and put it in the com.google.zxing namespace (but left the license in tact - is this okay for Apache 2.0 stuff?). The reason was that they encourage copying the relevant two files into your project and modifying as neccesary. In this case, it wasn't about modifying for functionalities sake, but rather for android support libraries sake. The upstream version doesn't support android.support.v4.app.Fragments, only android.app.Fragments. Hooking up the intent integrator from zxing almost removes the need for the refactoring which made FDroid.java responsible for handling "new repo" intents. However, there is still the one case of the user not using the QR code, but rather a web browser to connect to a swap. That is, they will click a link on the other phones web browser, which directs them to initiate the swap. Thus, we still need FDroid.java to be able to distinguish between a "swap" new repo request, and a regular "add repo" new repo request. In the process, I also commented out the "It's not working" button.
2014-08-04 08:02:12 +09:30
android:layout_above="@+id/btn_qr_scanner"
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
android:layout_centerHorizontal="true"
Beginnings of an implementation for Swap. The Fragments and an Activity which tie all of the swap views together has begun. The first bit of implementation is to get the current wifi network displayed, which worked out alright. This commit contains a lot of theme related stuff, particularly involving taking assets from carries mockups and making them suitable to use as drawables. The process for doing this is a story for another day, but I'll document it and put it on the wiki in the future. carrie showed me a script that a mate of hers used on another project, and I've adapted it a little to make it work nicely here (note - it isn't in this commit). The button is blue, and always shown with associated text in the ActionBar. This required a custom drawable which was set as the background in the styles.xml.
2014-08-19 15:37:44 +09:30
style="@style/SwapTheme.Wizard.LocalIpAddress"/>
</RelativeLayout>
Reference in New Issue Copy Permalink