Commit cd5408b1 authored 1 year ago by Taras

Merge branch 'feature/subscription' into develop

parents 204291e0 b8141646

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/org/futo/circles/extensions/ContextExtensions.kt 10 additions, 0 deletions

...ain/java/org/futo/circles/extensions/ContextExtensions.kt
app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt 6 additions, 0 deletions

...ava/org/futo/circles/feature/settings/SettingsFragment.kt
app/src/main/java/org/futo/circles/feature/settings/SettingsNavigator.kt 9 additions, 1 deletion

...va/org/futo/circles/feature/settings/SettingsNavigator.kt
app/src/main/java/org/futo/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt 6 additions, 3 deletions

...o/circles/feature/timeline/post/emoji/EmojiBottomSheet.kt
app/src/main/res/drawable/ic_payment.xml 5 additions, 0 deletions

app/src/main/res/drawable/ic_payment.xml
app/src/main/res/drawable/ic_phone.xml 9 additions, 4 deletions

app/src/main/res/drawable/ic_phone.xml
app/src/main/res/layout/fragment_settings.xml 16 additions, 0 deletions

app/src/main/res/layout/fragment_settings.xml
app/src/main/res/navigation/settings_nav_graph.xml 8 additions, 0 deletions

app/src/main/res/navigation/settings_nav_graph.xml
auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt 3 additions, 2 deletions

...ava/org/futo/circles/auth/feature/log_in/LogInFragment.kt
auth/src/main/java/org/futo/circles/auth/feature/manage_subscription/ManageSubscriptionDialogFragment.kt 104 additions, 0 deletions

...e/manage_subscription/ManageSubscriptionDialogFragment.kt
auth/src/main/java/org/futo/circles/auth/feature/manage_subscription/ManageSubscriptionViewModel.kt 54 additions, 0 deletions

...eature/manage_subscription/ManageSubscriptionViewModel.kt
auth/src/main/java/org/futo/circles/auth/feature/sign_up/SignUpDataSource.kt 8 additions, 26 deletions

...org/futo/circles/auth/feature/sign_up/SignUpDataSource.kt
auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt 9 additions, 28 deletions

...eature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt 3 additions, 35 deletions

.../feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt 2 additions, 28 deletions

...feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/SubscriptionStageDataSource.kt 4 additions, 3 deletions

...sign_up/subscription_stage/SubscriptionStageDataSource.kt
auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/SubscriptionStageFragment.kt 11 additions, 3 deletions

...e/sign_up/subscription_stage/SubscriptionStageFragment.kt
auth/src/main/java/org/futo/circles/auth/feature/sign_up/subscription_stage/SubscriptionStageViewModel.kt 16 additions, 4 deletions

.../sign_up/subscription_stage/SubscriptionStageViewModel.kt
auth/src/main/java/org/futo/circles/auth/model/ActiveSubscriptionInfo.kt 12 additions, 0 deletions

...ava/org/futo/circles/auth/model/ActiveSubscriptionInfo.kt
auth/src/main/java/org/futo/circles/auth/model/SubscriptionReceiptData.kt 5 additions, 1 deletion

...va/org/futo/circles/auth/model/SubscriptionReceiptData.kt

with 300 additions and 138 deletions

Please register or to comment