diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..292d82dcb6cc173659c1a474f4f572148246c2fb --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,19 @@ +stages: + - build + - test + +build: + stage: build + script: + - echo "Building" + - mkdir build + - touch build/info.txt + artifacts: + paths: + - build/ + +test: + stage: test + script: + - echo "Testing" + - test -f "build/info.txt" \ No newline at end of file diff --git a/presentation/build.gradle b/presentation/build.gradle index 4fb2c788793710b9e408cedbf700494f21538249..d1e9de0570d68d1c4d9243e6f022ce9d11ad5d50 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -31,8 +31,8 @@ android { applicationId "foundation.e.message" minSdkVersion 21 targetSdkVersion 28 - versionCode 191 - versionName "3.6.1" + versionCode 192 + versionName "3.6.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" buildConfigField "String", "BUGSNAG_API_KEY", "\"${System.getenv("BUGSNAG_API_KEY")}\"" diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index bcaefcdb522dde124ebf1591969bf75ea15ad333..85ac2c5f26f97c7673d1de941d9f41dee809ec9a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -69,13 +69,20 @@ import javax.inject.Inject class MainActivity : QkThemedActivity(), MainView { - @Inject lateinit var disposables: CompositeDisposable - @Inject lateinit var navigator: Navigator - @Inject lateinit var conversationsAdapter: ConversationsAdapter - @Inject lateinit var drawerBadgesExperiment: DrawerBadgesExperiment - @Inject lateinit var searchAdapter: SearchAdapter - @Inject lateinit var itemTouchCallback: ConversationItemTouchCallback - @Inject lateinit var viewModelFactory: ViewModelProvider.Factory + @Inject + lateinit var disposables: CompositeDisposable + @Inject + lateinit var navigator: Navigator + @Inject + lateinit var conversationsAdapter: ConversationsAdapter + @Inject + lateinit var drawerBadgesExperiment: DrawerBadgesExperiment + @Inject + lateinit var searchAdapter: SearchAdapter + @Inject + lateinit var itemTouchCallback: ConversationItemTouchCallback + @Inject + lateinit var viewModelFactory: ViewModelProvider.Factory override val activityResumedIntent: Subject = PublishSubject.create() override val queryChangedIntent by lazy { toolbarSearch.textChanges() } @@ -177,6 +184,8 @@ class MainActivity : QkThemedActivity(), MainView { itemTouchCallback.adapter = conversationsAdapter conversationsAdapter.autoScrollToStart(recyclerView) + + } override fun render(state: MainState) { @@ -295,6 +304,10 @@ class MainActivity : QkThemedActivity(), MainView { snackbarButton?.setText(R.string.main_permission_allow) } } + +// hide the QKSMS+ + plusBanner.visibility = View.GONE + } override fun onResume() { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt index c7185c2114356260c22eb97099a6efe3820043c5..f3925b2558b4258730be35650b8d8b02fcf629c0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt @@ -49,7 +49,8 @@ class ThemePagerAdapter @Inject constructor(private val context: Context) : Page } override fun getCount(): Int { - return 2 + // return 2 + return 1 } } \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 119637258353da6124ba4f994fc9896980d747e1..3ce52871eabf9f43cd14fc8cd94ef8412e55b1aa 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -20,6 +20,7 @@ Message + New conversation Compose Shortcut disabled