Skip to content

Commit 98e267b

Browse files
Tomasz KądziołkaTomasz Kądziołka
Tomasz Kądziołka
authored and
Tomasz Kądziołka
committed
Removed less coupled code
1 parent 72fb9e0 commit 98e267b

16 files changed

+3
-594
lines changed

‎app/build.gradle

Lines changed: 3 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,6 @@ plugins {
1010
def STRING = "String"
1111

1212
android {
13-
signingConfigs {
14-
release {
15-
// NOTE: Create your own keystore.properties file
16-
def propsFile = rootProject.file('keystore.properties')
17-
if (propsFile.exists()) {
18-
def props = new Properties()
19-
props.load(new FileInputStream(propsFile))
20-
storeFile = file('../snipplog_keystore.jks')
21-
storePassword = props['storePassword']
22-
keyAlias = props['keyAlias']
23-
keyPassword = props['keyPassword']
24-
}
25-
}
26-
}
27-
2813
compileSdk 33
2914

3015
defaultConfig {
@@ -39,60 +24,25 @@ android {
3924

4025
buildTypes {
4126
def BASE_URL = "BASE_URL"
42-
def CONTACT_US_PAGE = "CONTACT_US_PAGE"
43-
def FACEBOOK_PAGE = "FACEBOOK_PAGE"
44-
def INSTAGRAM_PAGE = "INSTAGRAM_PAGE"
45-
def GITHUB_PAGE = "GITHUB_PAGE"
46-
def TWITTER_PAGE = "TWITTER_PAGE"
47-
48-
def PAYPAL_PAGE = "PAYPAL_PAGE"
49-
def CARD_PAGE = "CARD_PAGE"
50-
5127
def API_BASE_URL = "\"http://91.195.93.3:8000/snip-api/\"" // Must end with '/'
52-
def FACEBOOK_URL = "\"https://www.facebook.com/SnippLog-100576858857140\""
53-
def INSTAGRAM_URL = "\"https://www.instagram.com/snipp.log\""
54-
def GITHUB_URL = "\"https://github.com/SnippLog\""
55-
def TWITTER_URL = "\"https://twitter.com/SnippLog\""
56-
57-
def PAYPAL_PAY_URL = "\"https://www.paypal.com/donate?hosted_button_id=WZQNYKQFAHAJG\""
58-
def CARD_PAY_URL = "\"https://www.paypal.com/biz/fund?id=ACCDJCH2JAHDG\""
5928

6029
debug {
6130
minifyEnabled false
6231
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
6332

6433
buildConfigField STRING, BASE_URL, API_BASE_URL
65-
buildConfigField STRING, CONTACT_US_PAGE, FACEBOOK_URL
66-
buildConfigField STRING, FACEBOOK_PAGE, FACEBOOK_URL
67-
buildConfigField STRING, INSTAGRAM_PAGE, INSTAGRAM_URL
68-
buildConfigField STRING, GITHUB_PAGE, GITHUB_URL
69-
buildConfigField STRING, TWITTER_PAGE, TWITTER_URL
70-
buildConfigField STRING, PAYPAL_PAGE, PAYPAL_PAY_URL
71-
buildConfigField STRING, CARD_PAGE, CARD_PAY_URL
72-
}
73-
74-
release {
75-
minifyEnabled true
76-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
77-
78-
buildConfigField STRING, BASE_URL, API_BASE_URL
79-
buildConfigField STRING, CONTACT_US_PAGE, FACEBOOK_URL
80-
buildConfigField STRING, FACEBOOK_PAGE, FACEBOOK_URL
81-
buildConfigField STRING, INSTAGRAM_PAGE, INSTAGRAM_URL
82-
buildConfigField STRING, GITHUB_PAGE, GITHUB_URL
83-
buildConfigField STRING, TWITTER_PAGE, TWITTER_URL
84-
buildConfigField STRING, PAYPAL_PAGE, PAYPAL_PAY_URL
85-
buildConfigField STRING, CARD_PAGE, CARD_PAY_URL
86-
signingConfig signingConfigs.release
8734
}
8835
}
36+
8937
compileOptions {
9038
sourceCompatibility JavaVersion.VERSION_11
9139
targetCompatibility JavaVersion.VERSION_11
9240
}
41+
9342
kotlinOptions {
9443
jvmTarget = "11"
9544
}
45+
9646
lintOptions {
9747
abortOnError false
9848
}

‎app/src/main/java/pl/tkadziolka/snipmeandroid/di/NavigatorModule.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
11
package pl.tkadziolka.snipmeandroid.di
22

33
import org.koin.dsl.module
4-
import pl.tkadziolka.snipmeandroid.ui.contact.ContactNavigator
54
import pl.tkadziolka.snipmeandroid.ui.detail.DetailNavigator
6-
import pl.tkadziolka.snipmeandroid.ui.donate.DonateNavigator
75
import pl.tkadziolka.snipmeandroid.ui.edit.EditNavigator
86
import pl.tkadziolka.snipmeandroid.ui.login.LoginNavigator
97
import pl.tkadziolka.snipmeandroid.ui.main.MainNavigator
10-
import pl.tkadziolka.snipmeandroid.ui.preview.PreviewNavigator
118
import pl.tkadziolka.snipmeandroid.ui.splash.SplashNavigator
129

1310
internal val navigatorModule = module {
1411
factory { SplashNavigator() }
1512
factory { LoginNavigator() }
1613
factory { MainNavigator() }
17-
factory { PreviewNavigator() }
1814
factory { DetailNavigator() }
1915
factory { EditNavigator() }
20-
factory { ContactNavigator() }
21-
factory { DonateNavigator() }
2216
}

‎app/src/main/java/pl/tkadziolka/snipmeandroid/di/ViewModelModule.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,17 @@ import org.koin.dsl.module
55
import pl.tkadziolka.snipmeandroid.bridge.main.MainModel
66
import pl.tkadziolka.snipmeandroid.bridge.session.SessionModel
77
import pl.tkadziolka.snipmeandroid.ui.detail.DetailViewModel
8-
import pl.tkadziolka.snipmeandroid.ui.donate.DonateViewModel
98
import pl.tkadziolka.snipmeandroid.ui.edit.EditViewModel
109
import pl.tkadziolka.snipmeandroid.ui.login.LoginViewModel
1110
import pl.tkadziolka.snipmeandroid.ui.main.MainViewModel
12-
import pl.tkadziolka.snipmeandroid.ui.preview.PreviewViewModel
1311
import pl.tkadziolka.snipmeandroid.ui.session.SessionViewModel
14-
import pl.tkadziolka.snipmeandroid.ui.share.ShareViewModel
1512
import pl.tkadziolka.snipmeandroid.ui.splash.SplashViewModel
1613

1714
internal val viewModelModule = module {
1815
viewModel { SplashViewModel(get(), get()) }
1916
viewModel { LoginViewModel(get(), get(), get(), get()) }
2017
viewModel { SessionViewModel(get()) }
2118
viewModel { MainViewModel(get(), get(), get(), get(), get(), get(), get(), get()) }
22-
viewModel { PreviewViewModel(get(), get()) }
2319
viewModel { DetailViewModel(get(), get(), get(), get(), get(), get(), get()) }
2420
viewModel { EditViewModel(get(), get(), get(), get(), get(), get()) }
25-
viewModel { ShareViewModel(get(), get(), get()) }
26-
viewModel { DonateViewModel(get()) }
2721
}

‎app/src/main/java/pl/tkadziolka/snipmeandroid/ui/contact/ContactFragment.kt

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎app/src/main/java/pl/tkadziolka/snipmeandroid/ui/contact/ContactNavigator.kt

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎app/src/main/java/pl/tkadziolka/snipmeandroid/ui/donate/DonateFragment.kt

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎app/src/main/java/pl/tkadziolka/snipmeandroid/ui/donate/DonateNavigator.kt

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎app/src/main/java/pl/tkadziolka/snipmeandroid/ui/donate/DonateViewModel.kt

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎app/src/main/java/pl/tkadziolka/snipmeandroid/ui/error/ErrorFragment.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class ErrorFragment: Fragment() {
3131

3232
onBackPressed { navigateToPreviousSuccessScreen() }
3333
errorClose.setOnClick { navigateToPreviousSuccessScreen() }
34-
errorContact.setOnClick { requireContext().safeOpenWebsite(BuildConfig.CONTACT_US_PAGE) }
3534
}
3635

3736
private fun navigateToPreviousSuccessScreen() {

‎app/src/main/java/pl/tkadziolka/snipmeandroid/ui/preview/PreviewFragment.kt

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)