Skip to content

Commit

Permalink
Switch to modern code format. Organize imports. No functional changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Schildbach committed Oct 26, 2016
1 parent fe67590 commit 6aa17a0
Show file tree
Hide file tree
Showing 235 changed files with 21,885 additions and 24,473 deletions.
536 changes: 279 additions & 257 deletions eclipse-code-format.xml

Large diffs are not rendered by default.

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions sample-integration-android/AndroidManifest.xml
@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.schildbach.wallet.integration.sample"
android:versionCode="1"
android:versionName="1.0" >
package="de.schildbach.wallet.integration.sample"
android:versionCode="1"
android:versionName="1.0" >

<uses-sdk android:minSdkVersion="15" />
<uses-sdk android:minSdkVersion="15" />

<uses-feature
android:name="android.hardware.touchscreen"
android:required="false" />
<uses-feature
android:name="android.hardware.touchscreen"
android:required="false" />

<supports-screens
android:anyDensity="true"
android:largeScreens="true"
android:normalScreens="true"
android:smallScreens="true" />
<supports-screens
android:anyDensity="true"
android:largeScreens="true"
android:normalScreens="true"
android:smallScreens="true" />

<application android:label="Bitcoin in-app payment sample" >
<activity
android:name="de.schildbach.wallet.integration.sample.SampleActivity"
android:theme="@android:style/Theme.Light" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<application android:label="Bitcoin in-app payment sample" >
<activity
android:name="de.schildbach.wallet.integration.sample.SampleActivity"
android:theme="@android:style/Theme.Light" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
156 changes: 78 additions & 78 deletions sample-integration-android/res/layout/sample_activity.xml
@@ -1,93 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fillViewport="true"
android:scrollbars="none" >
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fillViewport="true"
android:scrollbars="none" >

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:layout_marginTop="24dp"
android:orientation="vertical" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:layout_marginTop="24dp"
android:orientation="vertical" >

<RadioGroup
android:layout_width="256dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal" >
<RadioGroup
android:layout_width="256dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal" >

<RadioButton
android:id="@+id/sample_network_mainnet"
style="@android:style/TextAppearance.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="Mainnet" />
<RadioButton
android:id="@+id/sample_network_mainnet"
style="@android:style/TextAppearance.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="Mainnet" />

<RadioButton
android:id="@+id/sample_network_testnet"
style="@android:style/TextAppearance.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:text="Testnet" />
</RadioGroup>
<RadioButton
android:id="@+id/sample_network_testnet"
style="@android:style/TextAppearance.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:text="Testnet" />
</RadioGroup>

<TextView
style="@android:style/TextAppearance.Medium"
android:layout_width="256dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:text="This demonstrates the integration of a &quot;Donate Bitcoins&quot; button in your app." />
<TextView
style="@android:style/TextAppearance.Medium"
android:layout_width="256dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:text="This demonstrates the integration of a &quot;Donate Bitcoins&quot; button in your app." />

<FrameLayout
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="1" >
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="1" >

<Button
android:id="@+id/sample_donate_button"
style="@android:style/TextAppearance.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Donate" />
</FrameLayout>
<Button
android:id="@+id/sample_donate_button"
style="@android:style/TextAppearance.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Donate" />
</FrameLayout>

<TextView
style="@android:style/TextAppearance.Medium"
android:layout_width="256dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:text="Here is a more complex request for a payment to two addresses." />
<TextView
style="@android:style/TextAppearance.Medium"
android:layout_width="256dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:text="Here is a more complex request for a payment to two addresses." />

<FrameLayout
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="1" >
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="1" >

<Button
android:id="@+id/sample_request_button"
style="@android:style/TextAppearance.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Request" />
</FrameLayout>
<Button
android:id="@+id/sample_request_button"
style="@android:style/TextAppearance.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Request" />
</FrameLayout>

<TextView
android:id="@+id/sample_donate_message"
style="@android:style/TextAppearance.Medium"
android:layout_width="256dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:minLines="5"
android:visibility="invisible" />
</LinearLayout>
<TextView
android:id="@+id/sample_donate_message"
style="@android:style/TextAppearance.Medium"
android:layout_width="256dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:minLines="5"
android:visibility="invisible" />
</LinearLayout>

</ScrollView>

0 comments on commit 6aa17a0

Please sign in to comment.