jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

organise packages

This commit is contained in:
Benoit Marty 2019-12-12 23:28:22 +01:00
parent 954019547d
commit 17bcd680b0
19 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,9 +98,9 @@
<category android:name="android.intent.category.OPENABLE" />
</intent-filter>
</activity>
<activity android:name=".features.signout.SignedOutActivity" />
<activity android:name=".features.signout.hard.SignedOutActivity" />
<activity
android:name=".features.signout.SoftLogoutActivity"
android:name=".features.signout.soft.SoftLogoutActivity"
android:windowSoftInputMode="adjustResize" />
<!-- Services -->

2
vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt
View File

@ -47,7 +47,7 @@ import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewNoPreviewFr
import im.vector.riotx.features.settings.*
import im.vector.riotx.features.settings.ignored.VectorSettingsIgnoredUsersFragment
import im.vector.riotx.features.settings.push.PushGatewaysFragment
import im.vector.riotx.features.signout.SoftLogoutFragment
import im.vector.riotx.features.signout.soft.SoftLogoutFragment
@Module
interface FragmentModule {

2
vector/src/main/java/im/vector/riotx/core/di/ScreenComponent.kt
View File

@ -49,7 +49,7 @@ import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity
import im.vector.riotx.features.roomdirectory.createroom.CreateRoomActivity
import im.vector.riotx.features.settings.VectorSettingsActivity
import im.vector.riotx.features.share.IncomingShareActivity
import im.vector.riotx.features.signout.SoftLogoutActivity
import im.vector.riotx.features.signout.soft.SoftLogoutActivity
import im.vector.riotx.features.ui.UiStateRepository
@Component(

4
vector/src/main/java/im/vector/riotx/features/MainActivity.kt
View File

@ -33,8 +33,8 @@ import im.vector.riotx.core.utils.deleteAllFiles
import im.vector.riotx.features.home.HomeActivity
import im.vector.riotx.features.login.LoginActivity
import im.vector.riotx.features.notifications.NotificationDrawerManager
import im.vector.riotx.features.signout.SignedOutActivity
import im.vector.riotx.features.signout.SoftLogoutActivity
import im.vector.riotx.features.signout.hard.SignedOutActivity
import im.vector.riotx.features.signout.soft.SoftLogoutActivity
import kotlinx.android.parcel.Parcelize
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope

2
vector/src/main/java/im/vector/riotx/features/signout/SignedOutActivity.kt → vector/src/main/java/im/vector/riotx/features/signout/hard/SignedOutActivity.kt
View File

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

2
vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutAction.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutAction.kt
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.riotx.features.signout
package im.vector.riotx.features.signout.soft
import im.vector.riotx.core.platform.VectorViewModelAction

2
vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutActivity.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt
View File

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

4
vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutController.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutController.kt
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.riotx.features.signout
package im.vector.riotx.features.signout.soft
import com.airbnb.epoxy.EpoxyController
import com.airbnb.mvrx.Fail
@ -25,7 +25,7 @@ import im.vector.riotx.core.epoxy.loadingItem
import im.vector.riotx.core.error.ErrorFormatter
import im.vector.riotx.core.resources.StringProvider
import im.vector.riotx.features.login.LoginMode
import im.vector.riotx.features.signout.epoxy.*
import im.vector.riotx.features.signout.soft.epoxy.*
import javax.inject.Inject
class SoftLogoutController @Inject constructor(

2
vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutFragment.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutFragment.kt
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.riotx.features.signout
package im.vector.riotx.features.signout.soft
import android.content.DialogInterface
import android.os.Bundle

6
vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutViewModel.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewModel.kt
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.riotx.features.signout
package im.vector.riotx.features.signout.soft
import com.airbnb.mvrx.*
import com.squareup.inject.assisted.Assisted
@ -32,7 +32,9 @@ import im.vector.riotx.core.platform.VectorViewModel
import im.vector.riotx.features.login.LoginMode
/**
*
* TODO Get login flow to tell if it's SSO or Password, or store this info during sigin?
* TODO Reset password
* TODO Test push: disable the pushers?
*/
class SoftLogoutViewModel @AssistedInject constructor(
@Assisted initialState: SoftLogoutViewState,

2
vector/src/main/java/im/vector/riotx/features/signout/SoftLogoutViewState.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewState.kt
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.riotx.features.signout
package im.vector.riotx.features.signout.soft
import com.airbnb.mvrx.*
import im.vector.riotx.features.login.LoginMode

2
vector/src/main/java/im/vector/riotx/features/signout/epoxy/LoginCenterButtonItem.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginCenterButtonItem.kt
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.riotx.features.signout.epoxy
package im.vector.riotx.features.signout.soft.epoxy
import android.widget.Button
import com.airbnb.epoxy.EpoxyAttribute

2
vector/src/main/java/im/vector/riotx/features/signout/epoxy/LoginErrorWithRetryItem.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.riotx.features.signout.epoxy
package im.vector.riotx.features.signout.soft.epoxy
import android.widget.Button
import android.widget.TextView

2
vector/src/main/java/im/vector/riotx/features/signout/epoxy/LoginHeaderItem.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginHeaderItem.kt
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.riotx.features.signout.epoxy
package im.vector.riotx.features.signout.soft.epoxy
import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R

2
vector/src/main/java/im/vector/riotx/features/signout/epoxy/LoginPasswordFormItem.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.riotx.features.signout.epoxy
package im.vector.riotx.features.signout.soft.epoxy
import android.os.Build
import android.text.Editable

2
vector/src/main/java/im/vector/riotx/features/signout/epoxy/LoginRedButtonItem.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginRedButtonItem.kt
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.riotx.features.signout.epoxy
package im.vector.riotx.features.signout.soft.epoxy
import android.widget.Button
import com.airbnb.epoxy.EpoxyAttribute

2
vector/src/main/java/im/vector/riotx/features/signout/epoxy/LoginTextItem.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTextItem.kt
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.riotx.features.signout.epoxy
package im.vector.riotx.features.signout.soft.epoxy
import android.widget.TextView
import com.airbnb.epoxy.EpoxyAttribute

2
vector/src/main/java/im/vector/riotx/features/signout/epoxy/LoginTitleItem.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleItem.kt
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.riotx.features.signout.epoxy
package im.vector.riotx.features.signout.soft.epoxy
import android.widget.TextView
import com.airbnb.epoxy.EpoxyAttribute

2
vector/src/main/java/im/vector/riotx/features/signout/epoxy/LoginTitleSmallItem.kt → vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleSmallItem.kt
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package im.vector.riotx.features.signout.epoxy
package im.vector.riotx.features.signout.soft.epoxy
import android.widget.TextView
import com.airbnb.epoxy.EpoxyAttribute