filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename package im.vector.riotx to im.vector.app (IDE)

Browse Source
This commit is contained in:
Benoit Marty 2020-08-03 18:23:05 +02:00 committed by Benoit Marty
parent 67fc2feacb
commit a1f90abcd2
981 changed files with 4434 additions and 4426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -23,6 +23,7 @@ Other changes:
- Hide Flair settings, this is not implemented yet. - Hide Flair settings, this is not implemented yet.
- Rename package `im.vector.riotx.attachmentviewer` to `im.vector.lib.attachmentviewer` - Rename package `im.vector.riotx.attachmentviewer` to `im.vector.lib.attachmentviewer`
- Rename package `im.vector.riotx.multipicker` to `im.vector.lib.multipicker` - Rename package `im.vector.riotx.multipicker` to `im.vector.lib.multipicker`
- Rename package `im.vector.riotx` to `im.vector.app`
Changes in Element 1.0.4 (2020-08-03) Changes in Element 1.0.4 (2020-08-03)
=================================================== ===================================================

2
vector/proguard-rules.pro vendored
View File

@ -20,7 +20,7 @@
# hide the original source file name. # hide the original source file name.
#-renamesourcefileattribute SourceFile #-renamesourcefileattribute SourceFile
-keep class im.vector.riotx.features.** { *; } -keep class im.vector.app.features.** { *; }
## print all the rules in a file ## print all the rules in a file
# -printconfiguration ../proguard_files/full-r8-config.txt # -printconfiguration ../proguard_files/full-r8-config.txt

4
vector/src/androidTest/java/im/vector/riotx/InstrumentedTest.kt → vector/src/androidTest/java/im/vector/app/InstrumentedTest.kt
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx package im.vector.app
import android.content.Context import android.content.Context
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
import im.vector.riotx.test.shared.createTimberTestRule import im.vector.app.test.shared.createTimberTestRule
import org.junit.Rule import org.junit.Rule
interface InstrumentedTest { interface InstrumentedTest {

2
vector/src/androidTest/java/im/vector/riotx/core/utils/TemporaryStoreTest.kt → vector/src/androidTest/java/im/vector/app/core/utils/TemporaryStoreTest.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.utils package im.vector.app.core.utils
import org.amshove.kluent.shouldBe import org.amshove.kluent.shouldBe
import org.junit.Test import org.junit.Test

4
vector/src/androidTest/java/im/vector/riotx/features/reactions/data/EmojiDataSourceTest.kt → vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt
View File

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.features.reactions.data package im.vector.app.features.reactions.data
import im.vector.riotx.InstrumentedTest import im.vector.app.InstrumentedTest
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue import org.junit.Assert.assertTrue
import org.junit.FixMethodOrder import org.junit.FixMethodOrder

2
vector/src/debug/AndroidManifest.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="im.vector.riotx"> package="im.vector.app">
<application> <application>
<activity android:name=".features.debug.TestLinkifyActivity" /> <activity android:name=".features.debug.TestLinkifyActivity" />

6
vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeActivity.kt → vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.features.debug package im.vector.app.features.debug
import android.os.Bundle import android.os.Bundle
import android.view.Menu import android.view.Menu
@ -22,8 +22,8 @@ import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.utils.toast import im.vector.app.core.utils.toast
import kotlinx.android.synthetic.debug.activity_test_material_theme.* import kotlinx.android.synthetic.debug.activity_test_material_theme.*
// Rendering is not the same with VectorBaseActivity // Rendering is not the same with VectorBaseActivity

2
vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeDarkActivity.kt → vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkActivity.kt
View File

@ -14,6 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.features.debug package im.vector.app.features.debug
class DebugMaterialThemeDarkActivity : DebugMaterialThemeActivity() class DebugMaterialThemeDarkActivity : DebugMaterialThemeActivity()

2
vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeLightActivity.kt → vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightActivity.kt
View File

@ -14,6 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.features.debug package im.vector.app.features.debug
class DebugMaterialThemeLightActivity : DebugMaterialThemeActivity() class DebugMaterialThemeLightActivity : DebugMaterialThemeActivity()

24
vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt → vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.features.debug package im.vector.app.features.debug
import android.app.Activity import android.app.Activity
import android.app.NotificationChannel import android.app.NotificationChannel
@ -25,18 +25,18 @@ import android.os.Build
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.core.app.Person import androidx.core.app.Person
import butterknife.OnClick import butterknife.OnClick
import im.vector.app.R
import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.di.ScreenComponent
import im.vector.app.core.platform.VectorBaseActivity
import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
import im.vector.app.core.utils.allGranted
import im.vector.app.core.utils.checkPermissions
import im.vector.app.core.utils.toast
import im.vector.app.features.debug.sas.DebugSasEmojiActivity
import im.vector.app.features.qrcode.QrCodeScannerActivity
import im.vector.matrix.android.internal.crypto.verification.qrcode.toQrCodeData import im.vector.matrix.android.internal.crypto.verification.qrcode.toQrCodeData
import im.vector.riotx.R
import im.vector.riotx.core.di.ActiveSessionHolder
import im.vector.riotx.core.di.ScreenComponent
import im.vector.riotx.core.platform.VectorBaseActivity
import im.vector.riotx.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
import im.vector.riotx.core.utils.allGranted
import im.vector.riotx.core.utils.checkPermissions
import im.vector.riotx.core.utils.toast
import im.vector.riotx.features.debug.sas.DebugSasEmojiActivity
import im.vector.riotx.features.qrcode.QrCodeScannerActivity
import kotlinx.android.synthetic.debug.activity_debug_menu.* import kotlinx.android.synthetic.debug.activity_debug_menu.*
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject

4
vector/src/debug/java/im/vector/riotx/features/debug/TestLinkifyActivity.kt → vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.features.debug package im.vector.app.features.debug
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -25,7 +25,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.coordinatorlayout.widget.CoordinatorLayout
import butterknife.BindView import butterknife.BindView
import butterknife.ButterKnife import butterknife.ButterKnife
import im.vector.riotx.R import im.vector.app.R
class TestLinkifyActivity : AppCompatActivity() { class TestLinkifyActivity : AppCompatActivity() {

8
vector/src/debug/java/im/vector/riotx/features/debug/sas/DebugSasEmojiActivity.kt → vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.features.debug.sas package im.vector.app.features.debug.sas
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import im.vector.app.R
import im.vector.app.core.extensions.cleanup
import im.vector.app.core.extensions.configureWith
import im.vector.matrix.android.api.crypto.getAllVerificationEmojis import im.vector.matrix.android.api.crypto.getAllVerificationEmojis
import im.vector.riotx.R
import im.vector.riotx.core.extensions.cleanup
import im.vector.riotx.core.extensions.configureWith
import kotlinx.android.synthetic.main.fragment_generic_recycler.* import kotlinx.android.synthetic.main.fragment_generic_recycler.*
class DebugSasEmojiActivity : AppCompatActivity() { class DebugSasEmojiActivity : AppCompatActivity() {

2
vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiController.kt → vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.features.debug.sas package im.vector.app.features.debug.sas
import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.epoxy.TypedEpoxyController
import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation

16
vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiItem.kt → vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt
View File

@ -14,20 +14,20 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.features.debug.sas package im.vector.app.features.debug.sas
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.widget.TextView import android.widget.TextView
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.app.core.epoxy.VectorEpoxyModel
import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation
import im.vector.riotx.core.epoxy.VectorEpoxyHolder
import im.vector.riotx.core.epoxy.VectorEpoxyModel
import me.gujun.android.span.image import me.gujun.android.span.image
import me.gujun.android.span.span import me.gujun.android.span.span
@EpoxyModelClass(layout = im.vector.riotx.R.layout.item_sas_emoji) @EpoxyModelClass(layout = im.vector.app.R.layout.item_sas_emoji)
abstract class SasEmojiItem : VectorEpoxyModel<SasEmojiItem.Holder>() { abstract class SasEmojiItem : VectorEpoxyModel<SasEmojiItem.Holder>() {
@EpoxyAttribute @EpoxyAttribute
@ -50,9 +50,9 @@ abstract class SasEmojiItem : VectorEpoxyModel<SasEmojiItem.Holder>() {
} }
class Holder : VectorEpoxyHolder() { class Holder : VectorEpoxyHolder() {
val indexView by bind<TextView>(im.vector.riotx.R.id.sas_emoji_index) val indexView by bind<TextView>(im.vector.app.R.id.sas_emoji_index)
val emojiView by bind<TextView>(im.vector.riotx.R.id.sas_emoji) val emojiView by bind<TextView>(im.vector.app.R.id.sas_emoji)
val textView by bind<TextView>(im.vector.riotx.R.id.sas_emoji_text) val textView by bind<TextView>(im.vector.app.R.id.sas_emoji_text)
val idView by bind<TextView>(im.vector.riotx.R.id.sas_emoji_text_id) val idView by bind<TextView>(im.vector.app.R.id.sas_emoji_text_id)
} }
} }

6
vector/src/debug/java/im/vector/riotx/receivers/DebugReceiver.kt → vector/src/debug/java/im/vector/app/receivers/DebugReceiver.kt
View File

@ -14,16 +14,16 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.receivers package im.vector.app.receivers
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.IntentFilter import android.content.IntentFilter
import android.content.SharedPreferences import android.content.SharedPreferences
import androidx.preference.PreferenceManager
import androidx.core.content.edit import androidx.core.content.edit
import im.vector.riotx.core.utils.lsFiles import androidx.preference.PreferenceManager
import im.vector.app.core.utils.lsFiles
import timber.log.Timber import timber.log.Timber
/** /**

4
vector/src/debug/res/layout/activity_debug_menu.xml
View File

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="im.vector.riotx.features.debug.DebugMenuActivity" tools:context="im.vector.app.features.debug.DebugMenuActivity"
tools:ignore="HardcodedText"> tools:ignore="HardcodedText">
<ScrollView <ScrollView
@ -68,7 +68,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Scan QR-code" /> android:text="Scan QR-code" />
<im.vector.riotx.core.ui.views.QrCodeImageView <im.vector.app.core.ui.views.QrCodeImageView
android:id="@+id/debug_qr_code" android:id="@+id/debug_qr_code"
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="200dp" android:layout_height="200dp"

2
vector/src/debug/res/layout/activity_test_linkify.xml
View File

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/riot_secondary_text_color_status" android:background="@color/riot_secondary_text_color_status"
tools:context="im.vector.riotx.features.debug.TestLinkifyActivity"> tools:context="im.vector.app.features.debug.TestLinkifyActivity">
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"

2
vector/src/fdroid/AndroidManifest.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="im.vector.riotx"> package="im.vector.app">
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

2
vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt → vector/src/fdroid/java/im/vector/app/FlavorCode.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx package im.vector.app
import android.content.Context import android.content.Context

10
vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt → vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
View File

@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.fdroid.features.settings.troubleshoot package im.vector.app.fdroid.features.settings.troubleshoot
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.resources.StringProvider import im.vector.app.core.resources.StringProvider
import im.vector.riotx.features.settings.VectorPreferences import im.vector.app.features.settings.VectorPreferences
import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest import im.vector.app.features.settings.troubleshoot.TroubleshootTest
import javax.inject.Inject import javax.inject.Inject
/** /**

8
vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt → vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
View File

@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.fdroid.features.settings.troubleshoot package im.vector.app.fdroid.features.settings.troubleshoot
import android.content.Context import android.content.Context
import android.net.ConnectivityManager import android.net.ConnectivityManager
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.net.ConnectivityManagerCompat import androidx.core.net.ConnectivityManagerCompat
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.resources.StringProvider import im.vector.app.core.resources.StringProvider
import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest import im.vector.app.features.settings.troubleshoot.TroubleshootTest
import javax.inject.Inject import javax.inject.Inject
class TestBackgroundRestrictions @Inject constructor(private val context: AppCompatActivity, class TestBackgroundRestrictions @Inject constructor(private val context: AppCompatActivity,

12
vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt → vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
View File

@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.fdroid.features.settings.troubleshoot package im.vector.app.fdroid.features.settings.troubleshoot
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.utils.isIgnoringBatteryOptimizations import im.vector.app.core.utils.isIgnoringBatteryOptimizations
import im.vector.riotx.core.utils.requestDisablingBatteryOptimization import im.vector.app.core.utils.requestDisablingBatteryOptimization
import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest import im.vector.app.features.settings.troubleshoot.TroubleshootTest
// Not used anymore // Not used anymore
class TestBatteryOptimization(val fragment: Fragment) : TroubleshootTest(R.string.settings_troubleshoot_test_battery_title) { class TestBatteryOptimization(val fragment: Fragment) : TroubleshootTest(R.string.settings_troubleshoot_test_battery_title) {

2
vector/src/fdroid/java/im/vector/riotx/fdroid/package-info.kt → vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt
View File

@ -17,4 +17,4 @@
/** /**
* Code exclusively used by the FDroid build and not referenced on the main source code * Code exclusively used by the FDroid build and not referenced on the main source code
*/ */
package im.vector.riotx.fdroid package im.vector.app.fdroid

6
vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt → vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.fdroid.receiver package im.vector.app.fdroid.receiver
import android.app.AlarmManager import android.app.AlarmManager
import android.app.PendingIntent import android.app.PendingIntent
@ -24,9 +24,9 @@ import android.content.Intent
import android.os.Build import android.os.Build
import android.os.PowerManager import android.os.PowerManager
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import im.vector.app.core.di.HasVectorInjector
import im.vector.app.core.services.VectorSyncService
import im.vector.matrix.android.internal.session.sync.job.SyncService import im.vector.matrix.android.internal.session.sync.job.SyncService
import im.vector.riotx.core.di.HasVectorInjector
import im.vector.riotx.core.services.VectorSyncService
import timber.log.Timber import timber.log.Timber
class AlarmSyncBroadcastReceiver : BroadcastReceiver() { class AlarmSyncBroadcastReceiver : BroadcastReceiver() {

4
vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt → vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt
View File

@ -15,12 +15,12 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.fdroid.receiver package im.vector.app.fdroid.receiver
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import im.vector.riotx.core.di.HasVectorInjector import im.vector.app.core.di.HasVectorInjector
import timber.log.Timber import timber.log.Timber
class OnApplicationUpgradeOrRebootReceiver : BroadcastReceiver() { class OnApplicationUpgradeOrRebootReceiver : BroadcastReceiver() {

10
vector/src/fdroid/java/im/vector/riotx/push/fcm/FcmHelper.kt → vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
View File

@ -16,14 +16,14 @@
*/ */
@file:Suppress("UNUSED_PARAMETER") @file:Suppress("UNUSED_PARAMETER")
package im.vector.riotx.push.fcm package im.vector.app.push.fcm
import android.app.Activity import android.app.Activity
import android.content.Context import android.content.Context
import im.vector.riotx.core.di.ActiveSessionHolder import im.vector.app.core.di.ActiveSessionHolder
import im.vector.riotx.core.pushers.PushersManager import im.vector.app.core.pushers.PushersManager
import im.vector.riotx.fdroid.receiver.AlarmSyncBroadcastReceiver import im.vector.app.fdroid.receiver.AlarmSyncBroadcastReceiver
import im.vector.riotx.features.settings.VectorPreferences import im.vector.app.features.settings.VectorPreferences
import timber.log.Timber import timber.log.Timber
/** /**

16
vector/src/fdroid/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt → vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
View File

@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.push.fcm package im.vector.app.push.fcm
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import im.vector.riotx.fdroid.features.settings.troubleshoot.TestAutoStartBoot import im.vector.app.fdroid.features.settings.troubleshoot.TestAutoStartBoot
import im.vector.riotx.fdroid.features.settings.troubleshoot.TestBackgroundRestrictions import im.vector.app.fdroid.features.settings.troubleshoot.TestBackgroundRestrictions
import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
import im.vector.riotx.features.settings.troubleshoot.TestAccountSettings import im.vector.app.features.settings.troubleshoot.TestAccountSettings
import im.vector.riotx.features.settings.troubleshoot.TestPushRulesSettings import im.vector.app.features.settings.troubleshoot.TestDeviceSettings
import im.vector.riotx.features.settings.troubleshoot.TestDeviceSettings import im.vector.app.features.settings.troubleshoot.TestPushRulesSettings
import im.vector.riotx.features.settings.troubleshoot.TestSystemSettings import im.vector.app.features.settings.troubleshoot.TestSystemSettings
import javax.inject.Inject import javax.inject.Inject
class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings, class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings,

2
vector/src/gplay/AndroidManifest.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="im.vector.riotx"> package="im.vector.app">
<application> <application>

100
vector/src/main/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="im.vector.riotx"> package="im.vector.app">
<!-- Needed for VOIP call to detect and switch to headset--> <!-- Needed for VOIP call to detect and switch to headset-->
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
@ -38,7 +38,7 @@
android:required="false" /> android:required="false" />
<application <application
android:name=".VectorApplication" android:name="im.vector.app.VectorApplication"
android:allowBackup="false" android:allowBackup="false"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
@ -54,13 +54,13 @@
android:value="9.9" /> android:value="9.9" />
<activity <activity
android:name=".features.MainActivity" android:name="im.vector.app.features.MainActivity"
android:theme="@style/AppTheme.Launcher" /> android:theme="@style/AppTheme.Launcher" />
<!-- Activity alias for the launcher Activity (must be declared after the Activity it targets) --> <!-- Activity alias for the launcher Activity (must be declared after the Activity it targets) -->
<activity-alias <activity-alias
android:name=".features.Alias" android:name=".features.Alias"
android:targetActivity=".features.MainActivity"> android:targetActivity="im.vector.app.features.MainActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@ -68,9 +68,9 @@
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity android:name=".features.home.HomeActivity" /> <activity android:name="im.vector.app.features.home.HomeActivity" />
<activity <activity
android:name=".features.login.LoginActivity" android:name="im.vector.app.features.login.LoginActivity"
android:launchMode="singleTask" android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize"> android:windowSoftInputMode="adjustResize">
<!-- Add intent filter to handle redirection URL after SSO login in external browser --> <!-- Add intent filter to handle redirection URL after SSO login in external browser -->
@ -84,50 +84,50 @@
<data android:host="element" /> <data android:host="element" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".features.media.ImageMediaViewerActivity" /> <activity android:name="im.vector.app.features.media.ImageMediaViewerActivity" />
<activity <activity
android:name=".features.media.VectorAttachmentViewerActivity" android:name="im.vector.app.features.media.VectorAttachmentViewerActivity"
android:theme="@style/AppTheme.Transparent" /> android:theme="@style/AppTheme.Transparent" />
<activity android:name=".features.media.BigImageViewerActivity" /> <activity android:name="im.vector.app.features.media.BigImageViewerActivity" />
<activity <activity
android:name=".features.rageshake.BugReportActivity" android:name="im.vector.app.features.rageshake.BugReportActivity"
android:label="@string/title_activity_bug_report" /> android:label="@string/title_activity_bug_report" />
<activity <activity
android:name=".features.settings.VectorSettingsActivity" android:name="im.vector.app.features.settings.VectorSettingsActivity"
android:label="@string/title_activity_settings" android:label="@string/title_activity_settings"
android:windowSoftInputMode="adjustResize" /> android:windowSoftInputMode="adjustResize" />
<activity android:name=".features.media.VideoMediaViewerActivity" /> <activity android:name="im.vector.app.features.media.VideoMediaViewerActivity" />
<activity <activity
android:name=".features.crypto.keysbackup.restore.KeysBackupRestoreActivity" android:name="im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreActivity"
android:label="@string/title_activity_keys_backup_setup" /> android:label="@string/title_activity_keys_backup_setup" />
<activity <activity
android:name=".features.crypto.keysbackup.setup.KeysBackupSetupActivity" android:name="im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupActivity"
android:label="@string/title_activity_keys_backup_restore" /> android:label="@string/title_activity_keys_backup_restore" />
<activity <activity
android:name=".features.crypto.keysbackup.settings.KeysBackupManageActivity" android:name="im.vector.app.features.crypto.keysbackup.settings.KeysBackupManageActivity"
android:label="@string/encryption_message_recovery" /> android:label="@string/encryption_message_recovery" />
<activity <activity
android:name=".features.reactions.EmojiReactionPickerActivity" android:name="im.vector.app.features.reactions.EmojiReactionPickerActivity"
android:label="@string/title_activity_emoji_reaction_picker" /> android:label="@string/title_activity_emoji_reaction_picker" />
<activity android:name=".features.roomdirectory.createroom.CreateRoomActivity" /> <activity android:name="im.vector.app.features.roomdirectory.createroom.CreateRoomActivity" />
<activity android:name=".features.roomdirectory.RoomDirectoryActivity" /> <activity android:name="im.vector.app.features.roomdirectory.RoomDirectoryActivity" />
<activity android:name=".features.roomdirectory.roompreview.RoomPreviewActivity" /> <activity android:name="im.vector.app.features.roomdirectory.roompreview.RoomPreviewActivity" />
<activity android:name=".features.home.room.filtered.FilteredRoomsActivity" /> <activity android:name="im.vector.app.features.home.room.filtered.FilteredRoomsActivity" />
<activity <activity
android:name=".features.home.room.detail.RoomDetailActivity" android:name="im.vector.app.features.home.room.detail.RoomDetailActivity"
android:parentActivityName=".features.home.HomeActivity"> android:parentActivityName="im.vector.app.features.home.HomeActivity">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value=".features.home.HomeActivity" /> android:value="im.vector.app.features.home.HomeActivity" />
</activity> </activity>
<activity android:name=".features.debug.DebugMenuActivity" /> <activity android:name="im.vector.app.features.debug.DebugMenuActivity" />
<activity android:name="im.vector.riotx.features.createdirect.CreateDirectRoomActivity" /> <activity android:name="im.vector.app.features.createdirect.CreateDirectRoomActivity" />
<activity android:name="im.vector.riotx.features.invite.InviteUsersToRoomActivity" /> <activity android:name="im.vector.app.features.invite.InviteUsersToRoomActivity" />
<activity android:name=".features.webview.VectorWebViewActivity" /> <activity android:name="im.vector.app.features.webview.VectorWebViewActivity" />
<activity android:name=".features.link.LinkHandlerActivity"> <activity android:name="im.vector.app.features.link.LinkHandlerActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -142,11 +142,11 @@
</activity> </activity>
<activity <activity
android:name=".features.share.IncomingShareActivity" android:name="im.vector.app.features.share.IncomingShareActivity"
android:parentActivityName=".features.home.HomeActivity"> android:parentActivityName="im.vector.app.features.home.HomeActivity">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value=".features.home.HomeActivity" /> android:value="im.vector.app.features.home.HomeActivity" />
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND" /> <action android:name="android.intent.action.SEND" />
@ -164,13 +164,13 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".features.roomprofile.RoomProfileActivity" /> <activity android:name="im.vector.app.features.roomprofile.RoomProfileActivity" />
<activity android:name=".features.signout.hard.SignedOutActivity" /> <activity android:name="im.vector.app.features.signout.hard.SignedOutActivity" />
<activity <activity
android:name=".features.signout.soft.SoftLogoutActivity" android:name="im.vector.app.features.signout.soft.SoftLogoutActivity"
android:windowSoftInputMode="adjustResize" /> android:windowSoftInputMode="adjustResize" />
<activity android:name=".features.permalink.PermalinkHandlerActivity"> <activity android:name="im.vector.app.features.permalink.PermalinkHandlerActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -184,33 +184,33 @@
</activity> </activity>
<activity <activity
android:name=".features.roommemberprofile.RoomMemberProfileActivity" android:name="im.vector.app.features.roommemberprofile.RoomMemberProfileActivity"
android:parentActivityName=".features.home.HomeActivity"> android:parentActivityName="im.vector.app.features.home.HomeActivity">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value=".features.home.HomeActivity" /> android:value="im.vector.app.features.home.HomeActivity" />
</activity> </activity>
<activity android:name=".features.qrcode.QrCodeScannerActivity" /> <activity android:name="im.vector.app.features.qrcode.QrCodeScannerActivity" />
<activity android:name=".features.crypto.quads.SharedSecureStorageActivity" /> <activity android:name="im.vector.app.features.crypto.quads.SharedSecureStorageActivity" />
<activity <activity
android:name="com.yalantis.ucrop.UCropActivity" android:name="com.yalantis.ucrop.UCropActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".features.attachments.preview.AttachmentsPreviewActivity" android:name="im.vector.app.features.attachments.preview.AttachmentsPreviewActivity"
android:theme="@style/AppTheme.AttachmentsPreview" /> android:theme="@style/AppTheme.AttachmentsPreview" />
<activity android:name=".features.call.VectorCallActivity" /> <activity android:name="im.vector.app.features.call.VectorCallActivity" />
<activity android:name=".features.terms.ReviewTermsActivity" /> <activity android:name="im.vector.app.features.terms.ReviewTermsActivity" />
<activity android:name=".features.widgets.WidgetActivity" /> <activity android:name="im.vector.app.features.widgets.WidgetActivity" />
<activity android:name=".features.pin.PinActivity" /> <activity android:name="im.vector.app.features.pin.PinActivity" />
<!-- Services --> <!-- Services -->
<service <service
android:name=".core.services.CallService" android:name="im.vector.app.core.services.CallService"
android:exported="false"> android:exported="false">
<!-- in order to get headset button events --> <!-- in order to get headset button events -->
<intent-filter> <intent-filter>
@ -219,11 +219,11 @@
</service> </service>
<service <service
android:name=".core.services.VectorSyncService" android:name="im.vector.app.core.services.VectorSyncService"
android:exported="false" /> android:exported="false" />
<service <service
android:name=".features.call.telecom.VectorConnectionService" android:name="im.vector.app.features.call.telecom.VectorConnectionService"
android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"> android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE">
<intent-filter> <intent-filter>
<action android:name="android.telecom.ConnectionService" /> <action android:name="android.telecom.ConnectionService" />
@ -233,12 +233,12 @@
<!-- Receivers --> <!-- Receivers -->
<receiver <receiver
android:name=".features.call.service.CallHeadsUpActionReceiver" android:name="im.vector.app.features.call.service.CallHeadsUpActionReceiver"
android:exported="false" /> android:exported="false" />
<!-- Exported false, should only be accessible from this app!! --> <!-- Exported false, should only be accessible from this app!! -->
<receiver <receiver
android:name=".features.notifications.NotificationBroadcastReceiver" android:name="im.vector.app.features.notifications.NotificationBroadcastReceiver"
android:enabled="true" android:enabled="true"
android:exported="false" /> android:exported="false" />

4
vector/src/main/java/im/vector/riotx/ActiveSessionDataSource.kt → vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt
View File

@ -15,11 +15,11 @@
* *
*/ */
package im.vector.riotx package im.vector.app
import arrow.core.Option import arrow.core.Option
import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.Session
import im.vector.riotx.core.utils.BehaviorDataSource import im.vector.app.core.utils.BehaviorDataSource
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton

10
vector/src/main/java/im/vector/riotx/AppStateHandler.kt → vector/src/main/java/im/vector/app/AppStateHandler.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx package im.vector.app
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleObserver import androidx.lifecycle.LifecycleObserver
@ -24,10 +24,10 @@ import im.vector.matrix.android.api.session.group.model.GroupSummary
import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.session.room.model.RoomSummary
import im.vector.matrix.android.api.session.room.roomSummaryQueryParams import im.vector.matrix.android.api.session.room.roomSummaryQueryParams
import im.vector.matrix.rx.rx import im.vector.matrix.rx.rx
import im.vector.riotx.features.grouplist.ALL_COMMUNITIES_GROUP_ID import im.vector.app.features.grouplist.ALL_COMMUNITIES_GROUP_ID
import im.vector.riotx.features.grouplist.SelectedGroupDataSource import im.vector.app.features.grouplist.SelectedGroupDataSource
import im.vector.riotx.features.home.HomeRoomListDataSource import im.vector.app.features.home.HomeRoomListDataSource
import im.vector.riotx.features.home.room.list.ChronologicalRoomComparator import im.vector.app.features.home.room.list.ChronologicalRoomComparator
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.CompositeDisposable

2
vector/src/main/java/im/vector/riotx/EmojiCompatFontProvider.kt → vector/src/main/java/im/vector/app/EmojiCompatFontProvider.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx package im.vector.app
import android.graphics.Typeface import android.graphics.Typeface
import androidx.core.provider.FontsContractCompat import androidx.core.provider.FontsContractCompat

2
vector/src/main/java/im/vector/riotx/EmojiCompatWrapper.kt → vector/src/main/java/im/vector/app/EmojiCompatWrapper.kt
View File

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx package im.vector.app
import android.content.Context import android.content.Context
import androidx.core.provider.FontRequest import androidx.core.provider.FontRequest

36
vector/src/main/java/im/vector/riotx/VectorApplication.kt → vector/src/main/java/im/vector/app/VectorApplication.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx package im.vector.app
import android.app.Application import android.app.Application
import android.content.Context import android.content.Context
@ -36,23 +36,23 @@ import im.vector.matrix.android.api.Matrix
import im.vector.matrix.android.api.MatrixConfiguration import im.vector.matrix.android.api.MatrixConfiguration
import im.vector.matrix.android.api.auth.AuthenticationService import im.vector.matrix.android.api.auth.AuthenticationService
import im.vector.matrix.android.api.legacy.LegacySessionImporter import im.vector.matrix.android.api.legacy.LegacySessionImporter
import im.vector.riotx.core.di.ActiveSessionHolder import im.vector.app.core.di.ActiveSessionHolder
import im.vector.riotx.core.di.DaggerVectorComponent import im.vector.app.core.di.DaggerVectorComponent
import im.vector.riotx.core.di.HasVectorInjector import im.vector.app.core.di.HasVectorInjector
import im.vector.riotx.core.di.VectorComponent import im.vector.app.core.di.VectorComponent
import im.vector.riotx.core.extensions.configureAndStart import im.vector.app.core.extensions.configureAndStart
import im.vector.riotx.core.rx.RxConfig import im.vector.app.core.rx.RxConfig
import im.vector.riotx.features.configuration.VectorConfiguration import im.vector.app.features.configuration.VectorConfiguration
import im.vector.riotx.features.disclaimer.doNotShowDisclaimerDialog import im.vector.app.features.disclaimer.doNotShowDisclaimerDialog
import im.vector.riotx.features.lifecycle.VectorActivityLifecycleCallbacks import im.vector.app.features.lifecycle.VectorActivityLifecycleCallbacks
import im.vector.riotx.features.notifications.NotificationDrawerManager import im.vector.app.features.notifications.NotificationDrawerManager
import im.vector.riotx.features.notifications.NotificationUtils import im.vector.app.features.notifications.NotificationUtils
import im.vector.riotx.features.pin.PinLocker import im.vector.app.features.pin.PinLocker
import im.vector.riotx.features.popup.PopupAlertManager import im.vector.app.features.popup.PopupAlertManager
import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
import im.vector.riotx.features.settings.VectorPreferences import im.vector.app.features.settings.VectorPreferences
import im.vector.riotx.features.version.VersionProvider import im.vector.app.features.version.VersionProvider
import im.vector.riotx.push.fcm.FcmHelper import im.vector.app.push.fcm.FcmHelper
import timber.log.Timber import timber.log.Timber
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Date import java.util.Date

2
vector/src/main/java/im/vector/riotx/core/animations/AppBarStateChangeListener.kt → vector/src/main/java/im/vector/app/core/animations/AppBarStateChangeListener.kt
View File

@ -15,7 +15,7 @@
* *
*/ */
package im.vector.riotx.core.animations package im.vector.app.core.animations
import com.google.android.material.appbar.AppBarLayout import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener

2
vector/src/main/java/im/vector/riotx/core/animations/Constants.kt → vector/src/main/java/im/vector/app/core/animations/Constants.kt
View File

@ -14,6 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.animations package im.vector.app.core.animations
const val ANIMATION_DURATION_SHORT = 200L const val ANIMATION_DURATION_SHORT = 200L

2
vector/src/main/java/im/vector/riotx/core/animations/MatrixItemAppBarStateChangeListener.kt → vector/src/main/java/im/vector/app/core/animations/MatrixItemAppBarStateChangeListener.kt
View File

@ -15,7 +15,7 @@
* *
*/ */
package im.vector.riotx.core.animations package im.vector.app.core.animations
import android.view.View import android.view.View
import com.google.android.material.appbar.AppBarLayout import com.google.android.material.appbar.AppBarLayout

2
vector/src/main/java/im/vector/riotx/core/animations/SimpleAnimatorListener.kt → vector/src/main/java/im/vector/app/core/animations/SimpleAnimatorListener.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.animations package im.vector.app.core.animations
import android.animation.Animator import android.animation.Animator

2
vector/src/main/java/im/vector/riotx/core/animations/SimpleTransitionListener.kt → vector/src/main/java/im/vector/app/core/animations/SimpleTransitionListener.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.animations package im.vector.app.core.animations
import androidx.transition.Transition import androidx.transition.Transition

2
vector/src/main/java/im/vector/riotx/core/animations/VectorFullTransitionSet.kt → vector/src/main/java/im/vector/app/core/animations/VectorFullTransitionSet.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.animations package im.vector.app.core.animations
import android.content.Context import android.content.Context
import android.util.AttributeSet import android.util.AttributeSet

4
vector/src/main/java/im/vector/riotx/core/animations/behavior/PercentViewBehavior.kt → vector/src/main/java/im/vector/app/core/animations/behavior/PercentViewBehavior.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.animations.behavior package im.vector.app.core.animations.behavior
import android.animation.ArgbEvaluator import android.animation.ArgbEvaluator
import android.content.Context import android.content.Context
@ -24,7 +24,7 @@ import android.view.View
import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.content.withStyledAttributes import androidx.core.content.withStyledAttributes
import im.vector.riotx.R import im.vector.app.R
import kotlin.math.abs import kotlin.math.abs
private const val UNSPECIFIED_INT = Integer.MAX_VALUE private const val UNSPECIFIED_INT = Integer.MAX_VALUE

2
vector/src/main/java/im/vector/riotx/core/contacts/ContactsDataSource.kt → vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.contacts package im.vector.app.core.contacts
import android.content.Context import android.content.Context
import android.database.Cursor import android.database.Cursor

2
vector/src/main/java/im/vector/riotx/core/contacts/MappedContact.kt → vector/src/main/java/im/vector/app/core/contacts/MappedContact.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.contacts package im.vector.app.core.contacts
import android.net.Uri import android.net.Uri

4
vector/src/main/java/im/vector/riotx/core/date/VectorDateFormatter.kt → vector/src/main/java/im/vector/app/core/date/VectorDateFormatter.kt
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.date package im.vector.app.core.date
import android.content.Context import android.content.Context
import android.text.format.DateUtils import android.text.format.DateUtils
import im.vector.riotx.core.resources.LocaleProvider import im.vector.app.core.resources.LocaleProvider
import org.threeten.bp.LocalDateTime import org.threeten.bp.LocalDateTime
import org.threeten.bp.format.DateTimeFormatter import org.threeten.bp.format.DateTimeFormatter
import javax.inject.Inject import javax.inject.Inject

14
vector/src/main/java/im/vector/riotx/core/di/ActiveSessionHolder.kt → vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
View File

@ -14,17 +14,17 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import arrow.core.Option import arrow.core.Option
import im.vector.app.ActiveSessionDataSource
import im.vector.app.features.call.WebRtcPeerConnectionManager
import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler
import im.vector.app.features.notifications.PushRuleTriggerListener
import im.vector.app.features.session.SessionListener
import im.vector.matrix.android.api.auth.AuthenticationService import im.vector.matrix.android.api.auth.AuthenticationService
import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.Session
import im.vector.riotx.ActiveSessionDataSource
import im.vector.riotx.features.call.WebRtcPeerConnectionManager
import im.vector.riotx.features.crypto.keysrequest.KeyRequestHandler
import im.vector.riotx.features.crypto.verification.IncomingVerificationRequestHandler
import im.vector.riotx.features.notifications.PushRuleTriggerListener
import im.vector.riotx.features.session.SessionListener
import timber.log.Timber import timber.log.Timber
import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.atomic.AtomicReference
import javax.inject.Inject import javax.inject.Inject

2
vector/src/main/java/im/vector/riotx/core/di/AssistedInjectModule.kt → vector/src/main/java/im/vector/app/core/di/AssistedInjectModule.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import com.squareup.inject.assisted.dagger2.AssistedModule import com.squareup.inject.assisted.dagger2.AssistedModule
import dagger.Module import dagger.Module

2
vector/src/main/java/im/vector/riotx/core/di/FragmentKey.kt → vector/src/main/java/im/vector/app/core/di/FragmentKey.kt
View File

@ -15,7 +15,7 @@
* *
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import dagger.MapKey import dagger.MapKey

174
vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt → vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
View File

@ -15,99 +15,99 @@
* *
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentFactory import androidx.fragment.app.FragmentFactory
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import dagger.multibindings.IntoMap import dagger.multibindings.IntoMap
import im.vector.riotx.features.attachments.preview.AttachmentsPreviewFragment import im.vector.app.features.attachments.preview.AttachmentsPreviewFragment
import im.vector.riotx.features.contactsbook.ContactsBookFragment import im.vector.app.features.contactsbook.ContactsBookFragment
import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupSettingsFragment import im.vector.app.features.crypto.keysbackup.settings.KeysBackupSettingsFragment
import im.vector.riotx.features.crypto.quads.SharedSecuredStorageKeyFragment import im.vector.app.features.crypto.quads.SharedSecuredStorageKeyFragment
import im.vector.riotx.features.crypto.quads.SharedSecuredStoragePassphraseFragment import im.vector.app.features.crypto.quads.SharedSecuredStoragePassphraseFragment
import im.vector.riotx.features.crypto.recover.BootstrapAccountPasswordFragment import im.vector.app.features.crypto.recover.BootstrapAccountPasswordFragment
import im.vector.riotx.features.crypto.recover.BootstrapConclusionFragment import im.vector.app.features.crypto.recover.BootstrapConclusionFragment
import im.vector.riotx.features.crypto.recover.BootstrapConfirmPassphraseFragment import im.vector.app.features.crypto.recover.BootstrapConfirmPassphraseFragment
import im.vector.riotx.features.crypto.recover.BootstrapEnterPassphraseFragment import im.vector.app.features.crypto.recover.BootstrapEnterPassphraseFragment
import im.vector.riotx.features.crypto.recover.BootstrapMigrateBackupFragment import im.vector.app.features.crypto.recover.BootstrapMigrateBackupFragment
import im.vector.riotx.features.crypto.recover.BootstrapSaveRecoveryKeyFragment import im.vector.app.features.crypto.recover.BootstrapSaveRecoveryKeyFragment
import im.vector.riotx.features.crypto.recover.BootstrapSetupRecoveryKeyFragment import im.vector.app.features.crypto.recover.BootstrapSetupRecoveryKeyFragment
import im.vector.riotx.features.crypto.recover.BootstrapWaitingFragment import im.vector.app.features.crypto.recover.BootstrapWaitingFragment
import im.vector.riotx.features.crypto.verification.cancel.VerificationCancelFragment import im.vector.app.features.crypto.verification.cancel.VerificationCancelFragment
import im.vector.riotx.features.crypto.verification.cancel.VerificationNotMeFragment import im.vector.app.features.crypto.verification.cancel.VerificationNotMeFragment
import im.vector.riotx.features.crypto.verification.choose.VerificationChooseMethodFragment import im.vector.app.features.crypto.verification.choose.VerificationChooseMethodFragment
import im.vector.riotx.features.crypto.verification.conclusion.VerificationConclusionFragment import im.vector.app.features.crypto.verification.conclusion.VerificationConclusionFragment
import im.vector.riotx.features.crypto.verification.emoji.VerificationEmojiCodeFragment import im.vector.app.features.crypto.verification.emoji.VerificationEmojiCodeFragment
import im.vector.riotx.features.crypto.verification.qrconfirmation.VerificationQRWaitingFragment import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQRWaitingFragment
import im.vector.riotx.features.crypto.verification.qrconfirmation.VerificationQrScannedByOtherFragment import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQrScannedByOtherFragment
import im.vector.riotx.features.crypto.verification.request.VerificationRequestFragment import im.vector.app.features.crypto.verification.request.VerificationRequestFragment
import im.vector.riotx.features.discovery.DiscoverySettingsFragment import im.vector.app.features.discovery.DiscoverySettingsFragment
import im.vector.riotx.features.discovery.change.SetIdentityServerFragment import im.vector.app.features.discovery.change.SetIdentityServerFragment
import im.vector.riotx.features.grouplist.GroupListFragment import im.vector.app.features.grouplist.GroupListFragment
import im.vector.riotx.features.home.HomeDetailFragment import im.vector.app.features.home.HomeDetailFragment
import im.vector.riotx.features.home.HomeDrawerFragment import im.vector.app.features.home.HomeDrawerFragment
import im.vector.riotx.features.home.LoadingFragment import im.vector.app.features.home.LoadingFragment
import im.vector.riotx.features.home.room.breadcrumbs.BreadcrumbsFragment import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsFragment
import im.vector.riotx.features.home.room.detail.RoomDetailFragment import im.vector.app.features.home.room.detail.RoomDetailFragment
import im.vector.riotx.features.home.room.list.RoomListFragment import im.vector.app.features.home.room.list.RoomListFragment
import im.vector.riotx.features.login.LoginCaptchaFragment import im.vector.app.features.login.LoginCaptchaFragment
import im.vector.riotx.features.login.LoginFragment import im.vector.app.features.login.LoginFragment
import im.vector.riotx.features.login.LoginGenericTextInputFormFragment import im.vector.app.features.login.LoginGenericTextInputFormFragment
import im.vector.riotx.features.login.LoginResetPasswordFragment import im.vector.app.features.login.LoginResetPasswordFragment
import im.vector.riotx.features.login.LoginResetPasswordMailConfirmationFragment import im.vector.app.features.login.LoginResetPasswordMailConfirmationFragment
import im.vector.riotx.features.login.LoginResetPasswordSuccessFragment import im.vector.app.features.login.LoginResetPasswordSuccessFragment
import im.vector.riotx.features.login.LoginServerSelectionFragment import im.vector.app.features.login.LoginServerSelectionFragment
import im.vector.riotx.features.login.LoginServerUrlFormFragment import im.vector.app.features.login.LoginServerUrlFormFragment
import im.vector.riotx.features.login.LoginSignUpSignInSelectionFragment import im.vector.app.features.login.LoginSignUpSignInSelectionFragment
import im.vector.riotx.features.login.LoginSignUpSignInSsoFragment import im.vector.app.features.login.LoginSignUpSignInSsoFragment
import im.vector.riotx.features.login.LoginSplashFragment import im.vector.app.features.login.LoginSplashFragment
import im.vector.riotx.features.login.LoginWaitForEmailFragment import im.vector.app.features.login.LoginWaitForEmailFragment
import im.vector.riotx.features.login.LoginWebFragment import im.vector.app.features.login.LoginWebFragment
import im.vector.riotx.features.login.terms.LoginTermsFragment import im.vector.app.features.login.terms.LoginTermsFragment
import im.vector.riotx.features.pin.PinFragment import im.vector.app.features.pin.PinFragment
import im.vector.riotx.features.qrcode.QrCodeScannerFragment import im.vector.app.features.qrcode.QrCodeScannerFragment
import im.vector.riotx.features.reactions.EmojiChooserFragment import im.vector.app.features.reactions.EmojiChooserFragment
import im.vector.riotx.features.reactions.EmojiSearchResultFragment import im.vector.app.features.reactions.EmojiSearchResultFragment
import im.vector.riotx.features.roomdirectory.PublicRoomsFragment import im.vector.app.features.roomdirectory.PublicRoomsFragment
import im.vector.riotx.features.roomdirectory.createroom.CreateRoomFragment import im.vector.app.features.roomdirectory.createroom.CreateRoomFragment
import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerFragment import im.vector.app.features.roomdirectory.picker.RoomDirectoryPickerFragment
import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment import im.vector.app.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment
import im.vector.riotx.features.roommemberprofile.RoomMemberProfileFragment import im.vector.app.features.roommemberprofile.RoomMemberProfileFragment
import im.vector.riotx.features.roommemberprofile.devices.DeviceListFragment import im.vector.app.features.roommemberprofile.devices.DeviceListFragment
import im.vector.riotx.features.roommemberprofile.devices.DeviceTrustInfoActionFragment import im.vector.app.features.roommemberprofile.devices.DeviceTrustInfoActionFragment
import im.vector.riotx.features.roomprofile.RoomProfileFragment import im.vector.app.features.roomprofile.RoomProfileFragment
import im.vector.riotx.features.roomprofile.banned.RoomBannedMemberListFragment import im.vector.app.features.roomprofile.banned.RoomBannedMemberListFragment
import im.vector.riotx.features.roomprofile.members.RoomMemberListFragment import im.vector.app.features.roomprofile.members.RoomMemberListFragment
import im.vector.riotx.features.roomprofile.settings.RoomSettingsFragment import im.vector.app.features.roomprofile.settings.RoomSettingsFragment
import im.vector.riotx.features.roomprofile.uploads.RoomUploadsFragment import im.vector.app.features.roomprofile.uploads.RoomUploadsFragment
import im.vector.riotx.features.roomprofile.uploads.files.RoomUploadsFilesFragment import im.vector.app.features.roomprofile.uploads.files.RoomUploadsFilesFragment
import im.vector.riotx.features.roomprofile.uploads.media.RoomUploadsMediaFragment import im.vector.app.features.roomprofile.uploads.media.RoomUploadsMediaFragment
import im.vector.riotx.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment import im.vector.app.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment
import im.vector.riotx.features.settings.VectorSettingsHelpAboutFragment import im.vector.app.features.settings.VectorSettingsHelpAboutFragment
import im.vector.riotx.features.settings.VectorSettingsLabsFragment import im.vector.app.features.settings.VectorSettingsLabsFragment
import im.vector.riotx.features.settings.VectorSettingsNotificationPreferenceFragment import im.vector.app.features.settings.VectorSettingsNotificationPreferenceFragment
import im.vector.riotx.features.settings.VectorSettingsNotificationsTroubleshootFragment import im.vector.app.features.settings.VectorSettingsNotificationsTroubleshootFragment
import im.vector.riotx.features.settings.VectorSettingsPreferencesFragment import im.vector.app.features.settings.VectorSettingsPreferencesFragment
import im.vector.riotx.features.settings.VectorSettingsSecurityPrivacyFragment import im.vector.app.features.settings.VectorSettingsSecurityPrivacyFragment
import im.vector.riotx.features.settings.account.deactivation.DeactivateAccountFragment import im.vector.app.features.settings.account.deactivation.DeactivateAccountFragment
import im.vector.riotx.features.settings.crosssigning.CrossSigningSettingsFragment import im.vector.app.features.settings.crosssigning.CrossSigningSettingsFragment
import im.vector.riotx.features.settings.devices.VectorSettingsDevicesFragment import im.vector.app.features.settings.devices.VectorSettingsDevicesFragment
import im.vector.riotx.features.settings.devtools.AccountDataFragment import im.vector.app.features.settings.devtools.AccountDataFragment
import im.vector.riotx.features.settings.devtools.GossipingEventsPaperTrailFragment import im.vector.app.features.settings.devtools.GossipingEventsPaperTrailFragment
import im.vector.riotx.features.settings.devtools.IncomingKeyRequestListFragment import im.vector.app.features.settings.devtools.IncomingKeyRequestListFragment
import im.vector.riotx.features.settings.devtools.KeyRequestsFragment import im.vector.app.features.settings.devtools.KeyRequestsFragment
import im.vector.riotx.features.settings.devtools.OutgoingKeyRequestListFragment import im.vector.app.features.settings.devtools.OutgoingKeyRequestListFragment
import im.vector.riotx.features.settings.ignored.VectorSettingsIgnoredUsersFragment import im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment
import im.vector.riotx.features.settings.locale.LocalePickerFragment import im.vector.app.features.settings.locale.LocalePickerFragment
import im.vector.riotx.features.settings.push.PushGatewaysFragment import im.vector.app.features.settings.push.PushGatewaysFragment
import im.vector.riotx.features.share.IncomingShareFragment import im.vector.app.features.share.IncomingShareFragment
import im.vector.riotx.features.signout.soft.SoftLogoutFragment import im.vector.app.features.signout.soft.SoftLogoutFragment
import im.vector.riotx.features.terms.ReviewTermsFragment import im.vector.app.features.terms.ReviewTermsFragment
import im.vector.riotx.features.userdirectory.KnownUsersFragment import im.vector.app.features.userdirectory.KnownUsersFragment
import im.vector.riotx.features.userdirectory.UserDirectoryFragment import im.vector.app.features.userdirectory.UserDirectoryFragment
import im.vector.riotx.features.widgets.WidgetFragment import im.vector.app.features.widgets.WidgetFragment
@Module @Module
interface FragmentModule { interface FragmentModule {

2
vector/src/main/java/im/vector/riotx/core/di/HasScreenInjector.kt → vector/src/main/java/im/vector/app/core/di/HasScreenInjector.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
interface HasScreenInjector { interface HasScreenInjector {

2
vector/src/main/java/im/vector/riotx/core/di/HasVectorInjector.kt → vector/src/main/java/im/vector/app/core/di/HasVectorInjector.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
interface HasVectorInjector { interface HasVectorInjector {

6
vector/src/main/java/im/vector/riotx/core/di/ImageManager.kt → vector/src/main/java/im/vector/app/core/di/ImageManager.kt
View File

@ -14,16 +14,16 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import android.content.Context import android.content.Context
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.bumptech.glide.load.model.GlideUrl import com.bumptech.glide.load.model.GlideUrl
import com.github.piasy.biv.BigImageViewer import com.github.piasy.biv.BigImageViewer
import com.github.piasy.biv.loader.glide.GlideImageLoader import com.github.piasy.biv.loader.glide.GlideImageLoader
import im.vector.app.ActiveSessionDataSource
import im.vector.app.core.glide.FactoryUrl
import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.Session
import im.vector.riotx.ActiveSessionDataSource
import im.vector.riotx.core.glide.FactoryUrl
import java.io.InputStream import java.io.InputStream
import javax.inject.Inject import javax.inject.Inject

110
vector/src/main/java/im/vector/riotx/core/di/ScreenComponent.kt → vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
View File

@ -14,67 +14,67 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.FragmentFactory import androidx.fragment.app.FragmentFactory
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Component import dagger.Component
import im.vector.riotx.core.dialogs.UnrecognizedCertificateDialog import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
import im.vector.riotx.core.error.ErrorFormatter import im.vector.app.core.error.ErrorFormatter
import im.vector.riotx.core.preference.UserAvatarPreference import im.vector.app.core.preference.UserAvatarPreference
import im.vector.riotx.features.MainActivity import im.vector.app.features.MainActivity
import im.vector.riotx.features.call.CallControlsBottomSheet import im.vector.app.features.call.CallControlsBottomSheet
import im.vector.riotx.features.call.VectorCallActivity import im.vector.app.features.call.VectorCallActivity
import im.vector.riotx.features.createdirect.CreateDirectRoomActivity import im.vector.app.features.createdirect.CreateDirectRoomActivity
import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity import im.vector.app.features.crypto.keysbackup.settings.KeysBackupManageActivity
import im.vector.riotx.features.crypto.quads.SharedSecureStorageActivity import im.vector.app.features.crypto.quads.SharedSecureStorageActivity
import im.vector.riotx.features.crypto.recover.BootstrapBottomSheet import im.vector.app.features.crypto.recover.BootstrapBottomSheet
import im.vector.riotx.features.crypto.verification.VerificationBottomSheet import im.vector.app.features.crypto.verification.VerificationBottomSheet
import im.vector.riotx.features.debug.DebugMenuActivity import im.vector.app.features.debug.DebugMenuActivity
import im.vector.riotx.features.home.HomeActivity import im.vector.app.features.home.HomeActivity
import im.vector.riotx.features.home.HomeModule import im.vector.app.features.home.HomeModule
import im.vector.riotx.features.home.room.detail.RoomDetailActivity import im.vector.app.features.home.room.detail.RoomDetailActivity
import im.vector.riotx.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet import im.vector.app.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet
import im.vector.riotx.features.home.room.detail.timeline.action.MessageActionsBottomSheet import im.vector.app.features.home.room.detail.timeline.action.MessageActionsBottomSheet
import im.vector.riotx.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet import im.vector.app.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet
import im.vector.riotx.features.home.room.detail.timeline.reactions.ViewReactionsBottomSheet import im.vector.app.features.home.room.detail.timeline.reactions.ViewReactionsBottomSheet
import im.vector.riotx.features.home.room.detail.widget.RoomWidgetsBottomSheet import im.vector.app.features.home.room.detail.widget.RoomWidgetsBottomSheet
import im.vector.riotx.features.home.room.filtered.FilteredRoomsActivity import im.vector.app.features.home.room.filtered.FilteredRoomsActivity
import im.vector.riotx.features.home.room.list.RoomListModule import im.vector.app.features.home.room.list.RoomListModule
import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsBottomSheet import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet
import im.vector.riotx.features.invite.InviteUsersToRoomActivity import im.vector.app.features.invite.InviteUsersToRoomActivity
import im.vector.riotx.features.invite.VectorInviteView import im.vector.app.features.invite.VectorInviteView
import im.vector.riotx.features.link.LinkHandlerActivity import im.vector.app.features.link.LinkHandlerActivity
import im.vector.riotx.features.login.LoginActivity import im.vector.app.features.login.LoginActivity
import im.vector.riotx.features.media.VectorAttachmentViewerActivity import im.vector.app.features.media.BigImageViewerActivity
import im.vector.riotx.features.media.BigImageViewerActivity import im.vector.app.features.media.ImageMediaViewerActivity
import im.vector.riotx.features.media.ImageMediaViewerActivity import im.vector.app.features.media.VectorAttachmentViewerActivity
import im.vector.riotx.features.media.VideoMediaViewerActivity import im.vector.app.features.media.VideoMediaViewerActivity
import im.vector.riotx.features.navigation.Navigator import im.vector.app.features.navigation.Navigator
import im.vector.riotx.features.permalink.PermalinkHandlerActivity import im.vector.app.features.permalink.PermalinkHandlerActivity
import im.vector.riotx.features.pin.PinLocker import im.vector.app.features.pin.PinLocker
import im.vector.riotx.features.qrcode.QrCodeScannerActivity import im.vector.app.features.qrcode.QrCodeScannerActivity
import im.vector.riotx.features.rageshake.BugReportActivity import im.vector.app.features.rageshake.BugReportActivity
import im.vector.riotx.features.rageshake.BugReporter import im.vector.app.features.rageshake.BugReporter
import im.vector.riotx.features.rageshake.RageShake import im.vector.app.features.rageshake.RageShake
import im.vector.riotx.features.reactions.EmojiReactionPickerActivity import im.vector.app.features.reactions.EmojiReactionPickerActivity
import im.vector.riotx.features.reactions.widget.ReactionButton import im.vector.app.features.reactions.widget.ReactionButton
import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity import im.vector.app.features.roomdirectory.RoomDirectoryActivity
import im.vector.riotx.features.roomdirectory.createroom.CreateRoomActivity import im.vector.app.features.roomdirectory.createroom.CreateRoomActivity
import im.vector.riotx.features.roommemberprofile.RoomMemberProfileActivity import im.vector.app.features.roommemberprofile.RoomMemberProfileActivity
import im.vector.riotx.features.roommemberprofile.devices.DeviceListBottomSheet import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet
import im.vector.riotx.features.roomprofile.RoomProfileActivity import im.vector.app.features.roomprofile.RoomProfileActivity
import im.vector.riotx.features.settings.VectorSettingsActivity import im.vector.app.features.settings.VectorSettingsActivity
import im.vector.riotx.features.settings.devices.DeviceVerificationInfoBottomSheet import im.vector.app.features.settings.devices.DeviceVerificationInfoBottomSheet
import im.vector.riotx.features.share.IncomingShareActivity import im.vector.app.features.share.IncomingShareActivity
import im.vector.riotx.features.signout.soft.SoftLogoutActivity import im.vector.app.features.signout.soft.SoftLogoutActivity
import im.vector.riotx.features.terms.ReviewTermsActivity import im.vector.app.features.terms.ReviewTermsActivity
import im.vector.riotx.features.ui.UiStateRepository import im.vector.app.features.ui.UiStateRepository
import im.vector.riotx.features.widgets.WidgetActivity import im.vector.app.features.widgets.WidgetActivity
import im.vector.riotx.features.widgets.permissions.RoomWidgetPermissionBottomSheet import im.vector.app.features.widgets.permissions.RoomWidgetPermissionBottomSheet
import im.vector.riotx.features.workers.signout.SignOutBottomSheetDialogFragment import im.vector.app.features.workers.signout.SignOutBottomSheetDialogFragment
@Component( @Component(
dependencies = [ dependencies = [

4
vector/src/main/java/im/vector/riotx/core/di/ScreenModule.kt → vector/src/main/java/im/vector/app/core/di/ScreenModule.kt
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import im.vector.riotx.core.glide.GlideApp import im.vector.app.core.glide.GlideApp
@Module @Module
object ScreenModule { object ScreenModule {

2
vector/src/main/java/im/vector/riotx/core/di/ScreenScope.kt → vector/src/main/java/im/vector/app/core/di/ScreenScope.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import javax.inject.Scope import javax.inject.Scope

2
vector/src/main/java/im/vector/riotx/core/di/VectorAssistedModule.kt → vector/src/main/java/im/vector/app/core/di/VectorAssistedModule.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
/* /*
@Module(includes = [AssistedInject_VectorAssistedModule::class]) @Module(includes = [AssistedInject_VectorAssistedModule::class])

72
vector/src/main/java/im/vector/riotx/core/di/VectorComponent.kt → vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
View File

@ -14,50 +14,50 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import android.content.Context import android.content.Context
import android.content.res.Resources import android.content.res.Resources
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Component import dagger.Component
import im.vector.app.ActiveSessionDataSource
import im.vector.app.EmojiCompatFontProvider
import im.vector.app.EmojiCompatWrapper
import im.vector.app.VectorApplication
import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
import im.vector.app.core.error.ErrorFormatter
import im.vector.app.core.pushers.PushersManager
import im.vector.app.core.utils.AssetReader
import im.vector.app.core.utils.DimensionConverter
import im.vector.app.features.call.WebRtcPeerConnectionManager
import im.vector.app.features.configuration.VectorConfiguration
import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler
import im.vector.app.features.grouplist.SelectedGroupDataSource
import im.vector.app.features.home.AvatarRenderer
import im.vector.app.features.home.HomeRoomListDataSource
import im.vector.app.features.html.EventHtmlRenderer
import im.vector.app.features.html.VectorHtmlCompressor
import im.vector.app.features.login.ReAuthHelper
import im.vector.app.features.navigation.Navigator
import im.vector.app.features.notifications.NotifiableEventResolver
import im.vector.app.features.notifications.NotificationBroadcastReceiver
import im.vector.app.features.notifications.NotificationDrawerManager
import im.vector.app.features.notifications.NotificationUtils
import im.vector.app.features.notifications.PushRuleTriggerListener
import im.vector.app.features.pin.PinCodeStore
import im.vector.app.features.pin.PinLocker
import im.vector.app.features.popup.PopupAlertManager
import im.vector.app.features.rageshake.BugReporter
import im.vector.app.features.rageshake.VectorFileLogger
import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
import im.vector.app.features.reactions.data.EmojiDataSource
import im.vector.app.features.session.SessionListener
import im.vector.app.features.settings.VectorPreferences
import im.vector.app.features.ui.UiStateRepository
import im.vector.matrix.android.api.Matrix import im.vector.matrix.android.api.Matrix
import im.vector.matrix.android.api.auth.AuthenticationService import im.vector.matrix.android.api.auth.AuthenticationService
import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.Session
import im.vector.riotx.ActiveSessionDataSource
import im.vector.riotx.EmojiCompatFontProvider
import im.vector.riotx.EmojiCompatWrapper
import im.vector.riotx.VectorApplication
import im.vector.riotx.core.dialogs.UnrecognizedCertificateDialog
import im.vector.riotx.core.error.ErrorFormatter
import im.vector.riotx.core.pushers.PushersManager
import im.vector.riotx.core.utils.AssetReader
import im.vector.riotx.core.utils.DimensionConverter
import im.vector.riotx.features.call.WebRtcPeerConnectionManager
import im.vector.riotx.features.configuration.VectorConfiguration
import im.vector.riotx.features.crypto.keysrequest.KeyRequestHandler
import im.vector.riotx.features.crypto.verification.IncomingVerificationRequestHandler
import im.vector.riotx.features.grouplist.SelectedGroupDataSource
import im.vector.riotx.features.home.AvatarRenderer
import im.vector.riotx.features.home.HomeRoomListDataSource
import im.vector.riotx.features.html.EventHtmlRenderer
import im.vector.riotx.features.html.VectorHtmlCompressor
import im.vector.riotx.features.login.ReAuthHelper
import im.vector.riotx.features.navigation.Navigator
import im.vector.riotx.features.notifications.NotifiableEventResolver
import im.vector.riotx.features.notifications.NotificationBroadcastReceiver
import im.vector.riotx.features.notifications.NotificationDrawerManager
import im.vector.riotx.features.notifications.NotificationUtils
import im.vector.riotx.features.notifications.PushRuleTriggerListener
import im.vector.riotx.features.pin.PinCodeStore
import im.vector.riotx.features.pin.PinLocker
import im.vector.riotx.features.popup.PopupAlertManager
import im.vector.riotx.features.rageshake.BugReporter
import im.vector.riotx.features.rageshake.VectorFileLogger
import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler
import im.vector.riotx.features.reactions.data.EmojiDataSource
import im.vector.riotx.features.session.SessionListener
import im.vector.riotx.features.settings.VectorPreferences
import im.vector.riotx.features.ui.UiStateRepository
import javax.inject.Singleton import javax.inject.Singleton
@Component(modules = [VectorModule::class]) @Component(modules = [VectorModule::class])

2
vector/src/main/java/im/vector/riotx/core/di/VectorFragmentFactory.kt → vector/src/main/java/im/vector/app/core/di/VectorFragmentFactory.kt
View File

@ -15,7 +15,7 @@
* *
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentFactory import androidx.fragment.app.FragmentFactory

18
vector/src/main/java/im/vector/riotx/core/di/VectorModule.kt → vector/src/main/java/im/vector/app/core/di/VectorModule.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import android.content.Context import android.content.Context
import android.content.Context.MODE_PRIVATE import android.content.Context.MODE_PRIVATE
@ -23,18 +23,18 @@ import android.content.res.Resources
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import im.vector.app.core.error.DefaultErrorFormatter
import im.vector.app.core.error.ErrorFormatter
import im.vector.app.features.navigation.DefaultNavigator
import im.vector.app.features.navigation.Navigator
import im.vector.app.features.pin.PinCodeStore
import im.vector.app.features.pin.SharedPrefPinCodeStore
import im.vector.app.features.ui.SharedPreferencesUiStateRepository
import im.vector.app.features.ui.UiStateRepository
import im.vector.matrix.android.api.Matrix import im.vector.matrix.android.api.Matrix
import im.vector.matrix.android.api.auth.AuthenticationService import im.vector.matrix.android.api.auth.AuthenticationService
import im.vector.matrix.android.api.legacy.LegacySessionImporter import im.vector.matrix.android.api.legacy.LegacySessionImporter
import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.Session
import im.vector.riotx.core.error.DefaultErrorFormatter
import im.vector.riotx.core.error.ErrorFormatter
import im.vector.riotx.features.navigation.DefaultNavigator
import im.vector.riotx.features.navigation.Navigator
import im.vector.riotx.features.pin.PinCodeStore
import im.vector.riotx.features.pin.SharedPrefPinCodeStore
import im.vector.riotx.features.ui.SharedPreferencesUiStateRepository
import im.vector.riotx.features.ui.UiStateRepository
@Module @Module
abstract class VectorModule { abstract class VectorModule {

2
vector/src/main/java/im/vector/riotx/core/di/VectorViewModelFactory.kt → vector/src/main/java/im/vector/app/core/di/VectorViewModelFactory.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider

2
vector/src/main/java/im/vector/riotx/core/di/ViewModelKey.kt → vector/src/main/java/im/vector/app/core/di/ViewModelKey.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import dagger.MapKey import dagger.MapKey

32
vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt → vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
View File

@ -14,28 +14,28 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.di package im.vector.app.core.di
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import dagger.multibindings.IntoMap import dagger.multibindings.IntoMap
import im.vector.riotx.core.platform.ConfigurationViewModel import im.vector.app.core.platform.ConfigurationViewModel
import im.vector.riotx.features.call.SharedActiveCallViewModel import im.vector.app.features.call.SharedActiveCallViewModel
import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyViewModel import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyViewModel
import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel
import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel
import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupSharedViewModel import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupSharedViewModel
import im.vector.riotx.features.discovery.DiscoverySharedViewModel import im.vector.app.features.discovery.DiscoverySharedViewModel
import im.vector.riotx.features.home.HomeSharedActionViewModel import im.vector.app.features.home.HomeSharedActionViewModel
import im.vector.riotx.features.home.room.detail.RoomDetailSharedActionViewModel import im.vector.app.features.home.room.detail.RoomDetailSharedActionViewModel
import im.vector.riotx.features.home.room.detail.timeline.action.MessageSharedActionViewModel import im.vector.app.features.home.room.detail.timeline.action.MessageSharedActionViewModel
import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
import im.vector.riotx.features.reactions.EmojiChooserViewModel import im.vector.app.features.reactions.EmojiChooserViewModel
import im.vector.riotx.features.roomdirectory.RoomDirectorySharedActionViewModel import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel
import im.vector.riotx.features.roomprofile.RoomProfileSharedActionViewModel import im.vector.app.features.roomprofile.RoomProfileSharedActionViewModel
import im.vector.riotx.features.userdirectory.UserDirectorySharedActionViewModel import im.vector.app.features.userdirectory.UserDirectorySharedActionViewModel
@Module @Module
interface ViewModelModule { interface ViewModelModule {

4
vector/src/main/java/im/vector/riotx/core/dialogs/ConfirmationDialogBuilder.kt → vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.dialogs package im.vector.app.core.dialogs
import android.app.Activity import android.app.Activity
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.core.view.isVisible import androidx.core.view.isVisible
import im.vector.riotx.R import im.vector.app.R
import kotlinx.android.synthetic.main.dialog_confirmation_with_reason.view.* import kotlinx.android.synthetic.main.dialog_confirmation_with_reason.view.*
object ConfirmationDialogBuilder { object ConfirmationDialogBuilder {

4
vector/src/main/java/im/vector/riotx/core/dialogs/DialogLocker.kt → vector/src/main/java/im/vector/app/core/dialogs/DialogLocker.kt
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.dialogs package im.vector.app.core.dialogs
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import im.vector.riotx.core.platform.Restorable import im.vector.app.core.platform.Restorable
import timber.log.Timber import timber.log.Timber
private const val KEY_DIALOG_IS_DISPLAYED = "DialogLocker.KEY_DIALOG_IS_DISPLAYED" private const val KEY_DIALOG_IS_DISPLAYED = "DialogLocker.KEY_DIALOG_IS_DISPLAYED"

8
vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt → vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.dialogs package im.vector.app.core.dialogs
import android.app.Activity import android.app.Activity
import android.text.Editable import android.text.Editable
@ -23,9 +23,9 @@ import android.widget.ImageView
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputEditText
import com.google.android.material.textfield.TextInputLayout import com.google.android.material.textfield.TextInputLayout
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.extensions.showPassword import im.vector.app.core.extensions.showPassword
import im.vector.riotx.core.platform.SimpleTextWatcher import im.vector.app.core.platform.SimpleTextWatcher
class ExportKeysDialog { class ExportKeysDialog {

4
vector/src/main/java/im/vector/riotx/core/dialogs/Extensions.kt → vector/src/main/java/im/vector/app/core/dialogs/Extensions.kt
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.dialogs package im.vector.app.core.dialogs
import androidx.annotation.ColorRes import androidx.annotation.ColorRes
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import im.vector.riotx.R import im.vector.app.R
fun AlertDialog.withColoredButton(whichButton: Int, @ColorRes color: Int = R.color.vector_error_color): AlertDialog { fun AlertDialog.withColoredButton(whichButton: Int, @ColorRes color: Int = R.color.vector_error_color): AlertDialog {
getButton(whichButton)?.setTextColor(ContextCompat.getColor(context, color)) getButton(whichButton)?.setTextColor(ContextCompat.getColor(context, color))

4
vector/src/main/java/im/vector/riotx/core/dialogs/ManuallyVerifyDialog.kt → vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.dialogs package im.vector.app.core.dialogs
import android.app.Activity import android.app.Activity
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import im.vector.app.R
import im.vector.matrix.android.api.extensions.getFingerprintHumanReadable import im.vector.matrix.android.api.extensions.getFingerprintHumanReadable
import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo
import im.vector.riotx.R
object ManuallyVerifyDialog { object ManuallyVerifyDialog {

10
vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt → vector/src/main/java/im/vector/app/core/dialogs/PromptPasswordDialog.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.dialogs package im.vector.app.core.dialogs
import android.app.Activity import android.app.Activity
import android.content.DialogInterface import android.content.DialogInterface
@ -24,10 +24,10 @@ import android.widget.ImageView
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputEditText
import com.google.android.material.textfield.TextInputLayout import com.google.android.material.textfield.TextInputLayout
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.extensions.hideKeyboard import im.vector.app.core.extensions.hideKeyboard
import im.vector.riotx.core.extensions.showPassword import im.vector.app.core.extensions.showPassword
import im.vector.riotx.core.platform.SimpleTextWatcher import im.vector.app.core.platform.SimpleTextWatcher
class PromptPasswordDialog { class PromptPasswordDialog {

8
vector/src/main/java/im/vector/riotx/core/dialogs/UnrecognizedCertificateDialog.kt → vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
View File

@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.dialogs package im.vector.app.core.dialogs
import android.app.Activity import android.app.Activity
import android.view.View import android.view.View
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import im.vector.app.R
import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.resources.StringProvider
import im.vector.matrix.android.internal.network.ssl.Fingerprint import im.vector.matrix.android.internal.network.ssl.Fingerprint
import im.vector.riotx.R
import im.vector.riotx.core.di.ActiveSessionHolder
import im.vector.riotx.core.resources.StringProvider
import timber.log.Timber import timber.log.Timber
import java.util.HashMap import java.util.HashMap
import java.util.HashSet import java.util.HashSet

4
vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt → vector/src/main/java/im/vector/app/core/epoxy/DividerItem.kt
View File

@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy package im.vector.app.core.epoxy
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R import im.vector.app.R
/** /**
* Default background color is for the bottom sheets (R.attr.vctr_list_bottom_sheet_divider_color). * Default background color is for the bottom sheets (R.attr.vctr_list_bottom_sheet_divider_color).

4
vector/src/main/java/im/vector/riotx/core/epoxy/EmptyItem.kt → vector/src/main/java/im/vector/app/core/epoxy/EmptyItem.kt
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy package im.vector.app.core.epoxy
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R import im.vector.app.R
@EpoxyModelClass(layout = R.layout.item_empty) @EpoxyModelClass(layout = R.layout.item_empty)
abstract class EmptyItem : VectorEpoxyModel<EmptyItem.Holder>() { abstract class EmptyItem : VectorEpoxyModel<EmptyItem.Holder>() {

4
vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt → vector/src/main/java/im/vector/app/core/epoxy/ErrorWithRetryItem.kt
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy package im.vector.app.core.epoxy
import android.widget.Button import android.widget.Button
import android.widget.TextView import android.widget.TextView
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R import im.vector.app.R
@EpoxyModelClass(layout = R.layout.item_error_retry) @EpoxyModelClass(layout = R.layout.item_error_retry)
abstract class ErrorWithRetryItem : VectorEpoxyModel<ErrorWithRetryItem.Holder>() { abstract class ErrorWithRetryItem : VectorEpoxyModel<ErrorWithRetryItem.Holder>() {

4
vector/src/main/java/im/vector/riotx/core/epoxy/HelpFooterItem.kt → vector/src/main/java/im/vector/app/core/epoxy/HelpFooterItem.kt
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy package im.vector.app.core.epoxy
import android.widget.TextView import android.widget.TextView
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R import im.vector.app.R
@EpoxyModelClass(layout = R.layout.item_help_footer) @EpoxyModelClass(layout = R.layout.item_help_footer)
abstract class HelpFooterItem : VectorEpoxyModel<HelpFooterItem.Holder>() { abstract class HelpFooterItem : VectorEpoxyModel<HelpFooterItem.Holder>() {

6
vector/src/main/java/im/vector/riotx/core/epoxy/LayoutManagerStateRestorer.kt → vector/src/main/java/im/vector/app/core/epoxy/LayoutManagerStateRestorer.kt
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy package im.vector.app.core.epoxy
import android.os.Bundle import android.os.Bundle
import android.os.Parcelable import android.os.Parcelable
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import im.vector.riotx.core.platform.DefaultListUpdateCallback import im.vector.app.core.platform.DefaultListUpdateCallback
import im.vector.riotx.core.platform.Restorable import im.vector.app.core.platform.Restorable
import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.atomic.AtomicReference
private const val LAYOUT_MANAGER_STATE = "LAYOUT_MANAGER_STATE" private const val LAYOUT_MANAGER_STATE = "LAYOUT_MANAGER_STATE"

2
vector/src/main/java/im/vector/riotx/core/epoxy/Listener.kt → vector/src/main/java/im/vector/app/core/epoxy/Listener.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy package im.vector.app.core.epoxy
import android.view.View import android.view.View

6
vector/src/main/java/im/vector/riotx/core/epoxy/LoadingItem.kt → vector/src/main/java/im/vector/app/core/epoxy/LoadingItem.kt
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy package im.vector.app.core.epoxy
import android.widget.ProgressBar import android.widget.ProgressBar
import android.widget.TextView import android.widget.TextView
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.extensions.setTextOrHide import im.vector.app.core.extensions.setTextOrHide
@EpoxyModelClass(layout = R.layout.item_loading) @EpoxyModelClass(layout = R.layout.item_loading)
abstract class LoadingItem : VectorEpoxyModel<LoadingItem.Holder>() { abstract class LoadingItem : VectorEpoxyModel<LoadingItem.Holder>() {

4
vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt → vector/src/main/java/im/vector/app/core/epoxy/NoResultItem.kt
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy package im.vector.app.core.epoxy
import android.widget.TextView import android.widget.TextView
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R import im.vector.app.R
@EpoxyModelClass(layout = R.layout.item_no_result) @EpoxyModelClass(layout = R.layout.item_no_result)
abstract class NoResultItem : VectorEpoxyModel<NoResultItem.Holder>() { abstract class NoResultItem : VectorEpoxyModel<NoResultItem.Holder>() {

4
vector/src/main/java/im/vector/riotx/core/epoxy/SquareLoadingItem.kt → vector/src/main/java/im/vector/app/core/epoxy/SquareLoadingItem.kt
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy package im.vector.app.core.epoxy
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R import im.vector.app.R
@EpoxyModelClass(layout = R.layout.item_loading_square) @EpoxyModelClass(layout = R.layout.item_loading_square)
abstract class SquareLoadingItem : VectorEpoxyModel<SquareLoadingItem.Holder>() { abstract class SquareLoadingItem : VectorEpoxyModel<SquareLoadingItem.Holder>() {

2
vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyHolder.kt → vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyHolder.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy package im.vector.app.core.epoxy
import android.view.View import android.view.View
import com.airbnb.epoxy.EpoxyHolder import com.airbnb.epoxy.EpoxyHolder

2
vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt → vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyModel.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy package im.vector.app.core.epoxy
import androidx.annotation.CallSuper import androidx.annotation.CallSuper
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle

4
vector/src/main/java/im/vector/riotx/core/epoxy/ZeroItem.kt → vector/src/main/java/im/vector/app/core/epoxy/ZeroItem.kt
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy package im.vector.app.core.epoxy
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R import im.vector.app.R
/** /**
* Item of size (0, 0). * Item of size (0, 0).

2
vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonStyle.kt → vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonStyle.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy.attributes package im.vector.app.core.epoxy.attributes
enum class ButtonStyle { enum class ButtonStyle {
POSITIVE, POSITIVE,

2
vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonType.kt → vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonType.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy.attributes package im.vector.app.core.epoxy.attributes
enum class ButtonType { enum class ButtonType {
NO_BUTTON, NO_BUTTON,

2
vector/src/main/java/im/vector/riotx/core/epoxy/attributes/IconMode.kt → vector/src/main/java/im/vector/app/core/epoxy/attributes/IconMode.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy.attributes package im.vector.app.core.epoxy.attributes
enum class IconMode { enum class IconMode {
NONE, NONE,

10
vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetActionItem.kt → vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
* *
*/ */
package im.vector.riotx.core.epoxy.bottomsheet package im.vector.app.core.epoxy.bottomsheet
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.view.View import android.view.View
@ -28,10 +28,10 @@ import androidx.core.view.isVisible
import androidx.core.widget.ImageViewCompat import androidx.core.widget.ImageViewCompat
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.riotx.core.epoxy.VectorEpoxyModel import im.vector.app.core.epoxy.VectorEpoxyModel
import im.vector.riotx.features.themes.ThemeUtils import im.vector.app.features.themes.ThemeUtils
/** /**
* A action for bottom sheet. * A action for bottom sheet.

14
vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt → vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
View File

@ -14,20 +14,20 @@
* limitations under the License. * limitations under the License.
* *
*/ */
package im.vector.riotx.core.epoxy.bottomsheet package im.vector.app.core.epoxy.bottomsheet
import android.text.method.MovementMethod import android.text.method.MovementMethod
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.app.R
import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.app.core.epoxy.VectorEpoxyModel
import im.vector.app.core.extensions.setTextOrHide
import im.vector.app.features.home.AvatarRenderer
import im.vector.app.features.home.room.detail.timeline.tools.findPillsAndProcess
import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.MatrixItem
import im.vector.riotx.R
import im.vector.riotx.core.epoxy.VectorEpoxyHolder
import im.vector.riotx.core.epoxy.VectorEpoxyModel
import im.vector.riotx.core.extensions.setTextOrHide
import im.vector.riotx.features.home.AvatarRenderer
import im.vector.riotx.features.home.room.detail.timeline.tools.findPillsAndProcess
/** /**
* A message preview for bottom sheet. * A message preview for bottom sheet.

10
vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt → vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt
View File

@ -14,16 +14,16 @@
* limitations under the License. * limitations under the License.
* *
*/ */
package im.vector.riotx.core.epoxy.bottomsheet package im.vector.app.core.epoxy.bottomsheet
import android.graphics.Typeface import android.graphics.Typeface
import android.widget.TextView import android.widget.TextView
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.EmojiCompatFontProvider import im.vector.app.EmojiCompatFontProvider
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.riotx.core.epoxy.VectorEpoxyModel import im.vector.app.core.epoxy.VectorEpoxyModel
/** /**
* A quick reaction list for bottom sheet. * A quick reaction list for bottom sheet.

20
vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt → vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
* *
*/ */
package im.vector.riotx.core.epoxy.bottomsheet package im.vector.app.core.epoxy.bottomsheet
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.view.View import android.view.View
@ -24,16 +24,16 @@ import androidx.core.content.ContextCompat
import androidx.core.widget.ImageViewCompat import androidx.core.widget.ImageViewCompat
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.app.R
import im.vector.app.core.epoxy.ClickListener
import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.app.core.epoxy.VectorEpoxyModel
import im.vector.app.core.epoxy.onClick
import im.vector.app.core.extensions.setTextOrHide
import im.vector.app.core.resources.StringProvider
import im.vector.app.features.home.AvatarRenderer
import im.vector.app.features.themes.ThemeUtils
import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.MatrixItem
import im.vector.riotx.R
import im.vector.riotx.core.epoxy.ClickListener
import im.vector.riotx.core.epoxy.VectorEpoxyHolder
import im.vector.riotx.core.epoxy.VectorEpoxyModel
import im.vector.riotx.core.epoxy.onClick
import im.vector.riotx.core.extensions.setTextOrHide
import im.vector.riotx.core.resources.StringProvider
import im.vector.riotx.features.home.AvatarRenderer
import im.vector.riotx.features.themes.ThemeUtils
/** /**
* A room preview for bottom sheet. * A room preview for bottom sheet.

8
vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt → vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
* *
*/ */
package im.vector.riotx.core.epoxy.bottomsheet package im.vector.app.core.epoxy.bottomsheet
import android.view.View import android.view.View
import android.widget.TextView import android.widget.TextView
@ -22,9 +22,9 @@ import androidx.annotation.DrawableRes
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.riotx.core.epoxy.VectorEpoxyModel import im.vector.app.core.epoxy.VectorEpoxyModel
/** /**
* A send state for bottom sheet. * A send state for bottom sheet.

10
vector/src/main/java/im/vector/riotx/core/epoxy/profiles/BaseProfileMatrixItem.kt → vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
View File

@ -14,17 +14,17 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy.profiles package im.vector.app.core.epoxy.profiles
import android.view.View import android.view.View
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import im.vector.app.core.epoxy.VectorEpoxyModel
import im.vector.app.core.extensions.setTextOrHide
import im.vector.app.features.crypto.util.toImageRes
import im.vector.app.features.home.AvatarRenderer
import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel
import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.MatrixItem
import im.vector.riotx.core.epoxy.VectorEpoxyModel
import im.vector.riotx.core.extensions.setTextOrHide
import im.vector.riotx.features.crypto.util.toImageRes
import im.vector.riotx.features.home.AvatarRenderer
abstract class BaseProfileMatrixItem<T : ProfileMatrixItem.Holder> : VectorEpoxyModel<T>() { abstract class BaseProfileMatrixItem<T : ProfileMatrixItem.Holder> : VectorEpoxyModel<T>() {
@EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer

14
vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileActionItem.kt → vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy.profiles package im.vector.app.core.epoxy.profiles
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.view.View import android.view.View
@ -25,13 +25,13 @@ import androidx.core.view.isVisible
import androidx.core.widget.ImageViewCompat import androidx.core.widget.ImageViewCompat
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.app.R
import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.app.core.epoxy.VectorEpoxyModel
import im.vector.app.core.extensions.setTextOrHide
import im.vector.app.features.home.AvatarRenderer
import im.vector.app.features.themes.ThemeUtils
import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.MatrixItem
import im.vector.riotx.R
import im.vector.riotx.core.epoxy.VectorEpoxyHolder
import im.vector.riotx.core.epoxy.VectorEpoxyModel
import im.vector.riotx.core.extensions.setTextOrHide
import im.vector.riotx.features.home.AvatarRenderer
import im.vector.riotx.features.themes.ThemeUtils
@EpoxyModelClass(layout = R.layout.item_profile_action) @EpoxyModelClass(layout = R.layout.item_profile_action)
abstract class ProfileActionItem : VectorEpoxyModel<ProfileActionItem.Holder>() { abstract class ProfileActionItem : VectorEpoxyModel<ProfileActionItem.Holder>() {

8
vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileItemExtensions.kt → vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileItemExtensions.kt
View File

@ -15,14 +15,14 @@
* *
*/ */
package im.vector.riotx.core.epoxy.profiles package im.vector.app.core.epoxy.profiles
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import com.airbnb.epoxy.EpoxyController import com.airbnb.epoxy.EpoxyController
import im.vector.app.core.epoxy.ClickListener
import im.vector.app.core.epoxy.dividerItem
import im.vector.app.features.home.AvatarRenderer
import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.MatrixItem
import im.vector.riotx.core.epoxy.ClickListener
import im.vector.riotx.core.epoxy.dividerItem
import im.vector.riotx.features.home.AvatarRenderer
fun EpoxyController.buildProfileSection(title: String) { fun EpoxyController.buildProfileSection(title: String) {
profileSectionItem { profileSectionItem {

6
vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItem.kt → vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt
View File

@ -15,14 +15,14 @@
* *
*/ */
package im.vector.riotx.core.epoxy.profiles package im.vector.app.core.epoxy.profiles
import android.view.View import android.view.View
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyHolder
@EpoxyModelClass(layout = R.layout.item_profile_matrix_item) @EpoxyModelClass(layout = R.layout.item_profile_matrix_item)
abstract class ProfileMatrixItem : BaseProfileMatrixItem<ProfileMatrixItem.Holder>() { abstract class ProfileMatrixItem : BaseProfileMatrixItem<ProfileMatrixItem.Holder>() {

4
vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt → vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt
View File

@ -15,13 +15,13 @@
* *
*/ */
package im.vector.riotx.core.epoxy.profiles package im.vector.app.core.epoxy.profiles
import android.widget.ProgressBar import android.widget.ProgressBar
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R import im.vector.app.R
@EpoxyModelClass(layout = R.layout.item_profile_matrix_item_progress) @EpoxyModelClass(layout = R.layout.item_profile_matrix_item_progress)
abstract class ProfileMatrixItemWithProgress : BaseProfileMatrixItem<ProfileMatrixItemWithProgress.Holder>() { abstract class ProfileMatrixItemWithProgress : BaseProfileMatrixItem<ProfileMatrixItemWithProgress.Holder>() {

8
vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileSectionItem.kt → vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileSectionItem.kt
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.epoxy.profiles package im.vector.app.core.epoxy.profiles
import android.widget.TextView import android.widget.TextView
import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyHolder
import im.vector.riotx.core.epoxy.VectorEpoxyModel import im.vector.app.core.epoxy.VectorEpoxyModel
@EpoxyModelClass(layout = R.layout.item_profile_section) @EpoxyModelClass(layout = R.layout.item_profile_section)
abstract class ProfileSectionItem: VectorEpoxyModel<ProfileSectionItem.Holder>() { abstract class ProfileSectionItem: VectorEpoxyModel<ProfileSectionItem.Holder>() {

6
vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt → vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.error package im.vector.app.core.error
import im.vector.app.R
import im.vector.app.core.resources.StringProvider
import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.failure.Failure
import im.vector.matrix.android.api.failure.MatrixError import im.vector.matrix.android.api.failure.MatrixError
import im.vector.matrix.android.api.failure.isInvalidPassword import im.vector.matrix.android.api.failure.isInvalidPassword
import im.vector.matrix.android.api.session.identity.IdentityServiceError import im.vector.matrix.android.api.session.identity.IdentityServiceError
import im.vector.riotx.R
import im.vector.riotx.core.resources.StringProvider
import java.net.HttpURLConnection import java.net.HttpURLConnection
import java.net.SocketTimeoutException import java.net.SocketTimeoutException
import java.net.UnknownHostException import java.net.UnknownHostException

4
vector/src/main/java/im/vector/riotx/core/error/ResourceLimitErrorFormatter.kt → vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.error package im.vector.app.core.error
import android.content.Context import android.content.Context
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat
import im.vector.app.R
import im.vector.matrix.android.api.failure.MatrixError import im.vector.matrix.android.api.failure.MatrixError
import im.vector.riotx.R
import me.gujun.android.span.span import me.gujun.android.span.span
class ResourceLimitErrorFormatter(private val context: Context) { class ResourceLimitErrorFormatter(private val context: Context) {

2
vector/src/main/java/im/vector/riotx/core/error/fatal.kt → vector/src/main/java/im/vector/app/core/error/fatal.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.error package im.vector.app.core.error
import timber.log.Timber import timber.log.Timber

4
vector/src/main/java/im/vector/riotx/core/extensions/Activity.kt → vector/src/main/java/im/vector/app/core/extensions/Activity.kt
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.extensions package im.vector.app.core.extensions
import android.app.Activity import android.app.Activity
import android.os.Parcelable import android.os.Parcelable
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentTransaction import androidx.fragment.app.FragmentTransaction
import im.vector.riotx.core.platform.VectorBaseActivity import im.vector.app.core.platform.VectorBaseActivity
fun VectorBaseActivity.addFragment(frameId: Int, fragment: Fragment) { fun VectorBaseActivity.addFragment(frameId: Int, fragment: Fragment) {
supportFragmentManager.commitTransaction { add(frameId, fragment) } supportFragmentManager.commitTransaction { add(frameId, fragment) }

2
vector/src/main/java/im/vector/riotx/core/extensions/BasicExtensions.kt → vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.extensions package im.vector.app.core.extensions
import android.os.Bundle import android.os.Bundle
import android.util.Patterns import android.util.Patterns

2
vector/src/main/java/im/vector/riotx/core/extensions/Collections.kt → vector/src/main/java/im/vector/app/core/extensions/Collections.kt
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package im.vector.riotx.core.extensions package im.vector.app.core.extensions
inline fun <reified T> List<T>.nextOrNull(index: Int) = getOrNull(index + 1) inline fun <reified T> List<T>.nextOrNull(index: Int) = getOrNull(index + 1)
inline fun <reified T> List<T>.prevOrNull(index: Int) = getOrNull(index - 1) inline fun <reified T> List<T>.prevOrNull(index: Int) = getOrNull(index - 1)

Some files were not shown because too many files have changed in this diff Show More