Skip to content

Commit

Permalink
refresh bet slip, out of scope items, b 240
Browse files Browse the repository at this point in the history
  • Loading branch information
MIPPL committed Oct 29, 2019
1 parent fe73873 commit 9cec1a6
Show file tree
Hide file tree
Showing 41 changed files with 1,607 additions and 977 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
View file
Binary file not shown.
Binary file modified .idea/caches/gradle_models.ser
View file
Binary file not shown.
7 changes: 4 additions & 3 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId = 'com.wagerrwallet'
minSdkVersion 23
targetSdkVersion 28
versionCode 239
versionName "239"
versionCode 240
versionName "240"
multiDexEnabled true

// Similar to other properties in the defaultConfig block,
Expand Down Expand Up @@ -172,4 +172,5 @@ dependencies {
implementation 'junit:junit:4.12'
implementation 'com.android.support.test.espresso:espresso-core:3.0.1'
implementation 'tools.fastlane:screengrab:1.1.0'
}
implementation 'com.android.support:support-v4:27.1.1'
}
167 changes: 74 additions & 93 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,39 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.wagerrwallet">

<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_INTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.USE_FINGERPRINT"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.BIND_JOB_SERVICE"/>
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_INTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.BIND_JOB_SERVICE" />
<uses-permission
android:name="android.permission.PACKAGE_USAGE_STATS"
tools:ignore="ProtectedPermissions"/>

<!-- Allows unlocking your device and activating its screen so UI tests can succeed -->
<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
<!-- Allows changing locales -->
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION"/>
tools:ignore="ProtectedPermissions" /> <!-- Allows unlocking your device and activating its screen so UI tests can succeed -->
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" /> <!-- Allows changing locales -->
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />

<uses-feature
android:name="android.hardware.location.gps"
android:required="false"/>
android:required="false" />
<uses-feature
android:name="android.hardware.location.network"
android:required="false"/>
android:required="false" />
<uses-feature
android:name="android.hardware.telephony"
android:required="false"/>
android:required="false" />
<uses-feature
android:name="android.hardware.camera"
android:required="true"/>
android:required="true" />
<uses-feature
android:name="android.hardware.camera.autofocus"
android:required="false"/>
android:required="false" />

<application
android:name=".WagerrApp"
Expand All @@ -51,6 +48,9 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:windowSoftInputMode="stateVisible|adjustResize">
<activity
android:name=".presenter.activities.settings.BetSettings"
android:label="@string/title_activity_bet_settings"></activity>

<provider
android:name="android.support.v4.content.FileProvider"
Expand All @@ -59,7 +59,7 @@
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths"/>
android:resource="@xml/provider_paths" />
</provider>

<activity
Expand All @@ -68,9 +68,9 @@
android:launchMode="singleTask"
android:screenOrientation="portrait">
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.MAIN"/>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
Expand All @@ -81,23 +81,23 @@
android:theme="@style/AppTheme"
android:windowSoftInputMode="adjustPan">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="bitcoin"/>
<data android:scheme="bread"/>
<data android:scheme="bitcoincash"/>
<data android:scheme="bchtest"/>
<data android:scheme="bitcoin" />
<data android:scheme="bread" />
<data android:scheme="bitcoincash" />
<data android:scheme="bchtest" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEARCH"/>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>

<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable"/>
android:resource="@xml/searchable" />
</activity>
<activity
android:name=".presenter.activities.EventsActivity"
Expand All @@ -107,167 +107,148 @@
android:theme="@style/AppTheme"
android:windowSoftInputMode="adjustPan">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="bitcoin"/>
<data android:scheme="bread"/>
<data android:scheme="bitcoincash"/>
<data android:scheme="bchtest"/>
<data android:scheme="bitcoin" />
<data android:scheme="bread" />
<data android:scheme="bitcoincash" />
<data android:scheme="bchtest" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEARCH"/>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>

<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable"/>
android:resource="@xml/searchable" />
</activity>
<activity
android:name=".presenter.activities.SetPinActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>

android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.intro.RecoverActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.UnlinkActivity"
android:launchMode="singleTask"

android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.ImportActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>

android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.ReEnterPinActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.UpdatePinActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.LoginActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>

android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.SettingsActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait">
</activity>
android:screenOrientation="portrait"></activity>
<activity
android:name=".presenter.activities.settings.NotificationActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.SyncBlockchainActivity"
android:launchMode="singleTask"

android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.DisplayCurrencyActivity"
android:launchMode="singleTask"

android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.AboutActivity"
android:launchMode="singleTask"

android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.SecurityCenterActivity"
android:launchMode="singleTask"

android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.ShareDataActivity"
android:launchMode="singleTask"

android:screenOrientation="portrait"/>

android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.intro.WriteDownActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.PaperKeyActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>

android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.SpendLimitActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>

android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.PaperKeyProveActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.InputWordsActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.camera.ScanQRActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait">
</activity>
<!--Use launchMode="standard for WebViewActivity in order to be able to have multiple instances"-->
android:screenOrientation="portrait"></activity> <!-- Use launchMode="standard for WebViewActivity in order to be able to have multiple instances" -->
<activity
android:name=".presenter.activities.settings.WebViewActivity"
android:configChanges="orientation|keyboardHidden"
android:launchMode="standard"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize"/>
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".presenter.activities.DisabledActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.FingerprintActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.AdvancedActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.NodesActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.camera.CameraActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.TestActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>

android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.HomeActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait"/>

android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.CurrencySettingsActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait">

</activity>
android:screenOrientation="portrait"></activity>

<service
android:name=".tools.listeners.SyncReceiver"
android:enabled="true"
android:exported="false"
android:label="SyncReceiver"/>
android:label="SyncReceiver" />
</application>

</manifest>
Loading

0 comments on commit 9cec1a6

Please sign in to comment.