mobile/element-android
mobile/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-07-24 11:36:03 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Move test style Activity and layout to the new ui-style module

Browse source
This commit is contained in:
Benoit Marty 2021-06-15 14:48:45 +02:00
parent 000b524b34
commit bbbe76b91c
23 changed files with 124 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/ui-styles/build.gradle
View file

@ -46,6 +46,9 @@ android {
kotlinOptions {
jvmTarget = '1.8'
}
buildFeatures {
viewBinding true
}
}
dependencies {

29
library/ui-styles/src/debug/AndroidManifest.xml Normal file
View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="im.vector.lib.ui.styles">
<application>
<activity
android:name=".debug.DebugMaterialThemeLightDefaultActivity"
android:theme="@style/VectorMaterialThemeDebugLight" />
<activity
android:name=".debug.DebugMaterialThemeLightTestActivity"
android:theme="@style/VectorMaterialThemeDebugLight.Test" />
<activity
android:name=".debug.DebugMaterialThemeLightVectorActivity"
android:theme="@style/AppTheme.Light" />
<activity
android:name=".debug.DebugMaterialThemeDarkDefaultActivity"
android:theme="@style/VectorMaterialThemeDebugDark" />
<activity
android:name=".debug.DebugMaterialThemeDarkTestActivity"
android:theme="@style/VectorMaterialThemeDebugDark.Test" />
<activity
android:name=".debug.DebugMaterialThemeDarkVectorActivity"
android:theme="@style/AppTheme.Dark" />
<activity
android:name=".debug.DebugVectorButtonStylesActivity"
android:theme="@style/AppTheme.Light" />
</application>
</manifest>

4
vector/src/debug/java/im/vector/app/features/debug/DebugBottomSheet.kt → library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugBottomSheet.kt
View file

@ -14,14 +14,14 @@
* limitations under the License.
*/
package im.vector.app.features.debug
package im.vector.lib.ui.styles.debug
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import im.vector.app.databinding.ActivityTestMaterialThemeBinding
import im.vector.lib.ui.styles.databinding.ActivityTestMaterialThemeBinding
class DebugBottomSheet : BottomSheetDialogFragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {

14
vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt → library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt
View file

@ -1,5 +1,5 @@
/*
* Copyright 2019 New Vector Ltd
* Copyright (c) 2021 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,16 +14,16 @@
* limitations under the License.
*/
package im.vector.app.features.debug
package im.vector.lib.ui.styles.debug
import android.os.Bundle
import android.view.Menu
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar
import im.vector.app.R
import im.vector.app.core.utils.toast
import im.vector.app.databinding.ActivityTestMaterialThemeBinding
import im.vector.lib.ui.styles.R
import im.vector.lib.ui.styles.databinding.ActivityTestMaterialThemeBinding
// Rendering is not the same with VectorBaseActivity
abstract class DebugMaterialThemeActivity : AppCompatActivity() {
@ -46,14 +46,14 @@ abstract class DebugMaterialThemeActivity : AppCompatActivity() {
}
views.debugShowToast.setOnClickListener {
toast("Toast")
Toast.makeText(this, "Toast", Toast.LENGTH_SHORT).show()
}
views.debugShowDialog.setOnClickListener {
MaterialAlertDialogBuilder(this)
.setTitle("Dialog title")
.setMessage("Dialog content")
.setIcon(R.drawable.ic_settings_x)
.setIcon(R.drawable.ic_debug_icon)
.setPositiveButton("Positive", null)
.setNegativeButton("Negative", null)
.setNeutralButton("Neutral", null)

4
vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkDefaultActivity.kt → library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkDefaultActivity.kt
View file

@ -1,5 +1,5 @@
/*
* Copyright 2019 New Vector Ltd
* Copyright (c) 2021 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,6 +14,6 @@
* limitations under the License.
*/
package im.vector.app.features.debug
package im.vector.lib.ui.styles.debug
class DebugMaterialThemeDarkDefaultActivity : DebugMaterialThemeActivity()

4
vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkTestActivity.kt → library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkTestActivity.kt
View file

@ -1,5 +1,5 @@
/*
* Copyright 2019 New Vector Ltd
* Copyright (c) 2021 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,6 +14,6 @@
* limitations under the License.
*/
package im.vector.app.features.debug
package im.vector.lib.ui.styles.debug
class DebugMaterialThemeDarkTestActivity : DebugMaterialThemeActivity()

4
vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkVectorActivity.kt → library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeDarkVectorActivity.kt
View file

@ -1,5 +1,5 @@
/*
* Copyright 2019 New Vector Ltd
* Copyright (c) 2021 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,6 +14,6 @@
* limitations under the License.
*/
package im.vector.app.features.debug
package im.vector.lib.ui.styles.debug
class DebugMaterialThemeDarkVectorActivity : DebugMaterialThemeActivity()

4
vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightDefaultActivity.kt → library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightDefaultActivity.kt
View file

@ -1,5 +1,5 @@
/*
* Copyright 2019 New Vector Ltd
* Copyright (c) 2021 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,6 +14,6 @@
* limitations under the License.
*/
package im.vector.app.features.debug
package im.vector.lib.ui.styles.debug
class DebugMaterialThemeLightDefaultActivity : DebugMaterialThemeActivity()

4
vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightTestActivity.kt → library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightTestActivity.kt
View file

@ -1,5 +1,5 @@
/*
* Copyright 2019 New Vector Ltd
* Copyright (c) 2021 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,6 +14,6 @@
* limitations under the License.
*/
package im.vector.app.features.debug
package im.vector.lib.ui.styles.debug
class DebugMaterialThemeLightTestActivity : DebugMaterialThemeActivity()

4
vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightVectorActivity.kt → library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeLightVectorActivity.kt
View file

@ -1,5 +1,5 @@
/*
* Copyright 2019 New Vector Ltd
* Copyright (c) 2021 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,6 +14,6 @@
* limitations under the License.
*/
package im.vector.app.features.debug
package im.vector.lib.ui.styles.debug
class DebugMaterialThemeLightVectorActivity : DebugMaterialThemeActivity()

18
vector/src/debug/java/im/vector/app/features/debug/DebugVectorButtonStylesActivity.kt → library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugVectorButtonStylesActivity.kt
View file

@ -1,5 +1,5 @@
/*
* Copyright 2021 New Vector Ltd
* Copyright (c) 2021 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,11 +14,17 @@
* limitations under the License.
*/
package im.vector.app.features.debug
package im.vector.lib.ui.styles.debug
import im.vector.app.core.platform.VectorBaseActivity
import im.vector.app.databinding.ActivityDebugButtonStylesBinding
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import im.vector.lib.ui.styles.databinding.ActivityDebugButtonStylesBinding
class DebugVectorButtonStylesActivity : VectorBaseActivity<ActivityDebugButtonStylesBinding>() {
override fun getBinding() = ActivityDebugButtonStylesBinding.inflate(layoutInflater)
class DebugVectorButtonStylesActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val views = ActivityDebugButtonStylesBinding.inflate(layoutInflater)
setContentView(views.root)
}
}

22
library/ui-styles/src/debug/res/drawable/ic_debug_icon.xml Normal file
View file

@ -0,0 +1,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M10,10m-2.455,0a2.455,2.455 0,1 1,4.91 0a2.455,2.455 0,1 1,-4.91 0"
android:strokeLineJoin="round"
android:strokeWidth="1.2"
android:fillColor="#00000000"
android:fillType="evenOdd"
android:strokeColor="#454545"
android:strokeLineCap="round"/>
<path
android:pathData="M16.055,12.455a1.35,1.35 0,0 0,0.27 1.489l0.049,0.049a1.636,1.636 0,1 1,-2.316 2.315l-0.049,-0.049a1.35,1.35 0,0 0,-1.489 -0.27,1.35 1.35,0 0,0 -0.818,1.236v0.139a1.636,1.636 0,0 1,-3.273 0v-0.074a1.35,1.35 0,0 0,-0.884 -1.235,1.35 1.35,0 0,0 -1.489,0.27l-0.049,0.049a1.636,1.636 0,1 1,-2.315 -2.316l0.049,-0.049a1.35,1.35 0,0 0,0.27 -1.489,1.35 1.35,0 0,0 -1.236,-0.818h-0.139a1.636,1.636 0,0 1,0 -3.273h0.074a1.35,1.35 0,0 0,1.235 -0.884,1.35 1.35,0 0,0 -0.27,-1.489l-0.049,-0.049a1.636,1.636 0,1 1,2.316 -2.315l0.049,0.049a1.35,1.35 0,0 0,1.489 0.27h0.065a1.35,1.35 0,0 0,0.819 -1.236v-0.139a1.636,1.636 0,0 1,3.272 0v0.074a1.35,1.35 0,0 0,0.819 1.235,1.35 1.35,0 0,0 1.489,-0.27l0.049,-0.049a1.636,1.636 0,1 1,2.315 2.316l-0.049,0.049a1.35,1.35 0,0 0,-0.27 1.489v0.065a1.35,1.35 0,0 0,1.236 0.819h0.139a1.636,1.636 0,0 1,0 3.272h-0.074a1.35,1.35 0,0 0,-1.235 0.819z"
android:strokeLineJoin="round"
android:strokeWidth="1.2"
android:fillColor="#00000000"
android:fillType="evenOdd"
android:strokeColor="#454545"
android:strokeLineCap="round"/>
</vector>

0
vector/src/debug/res/drawable/linear_divider.xml → library/ui-styles/src/debug/res/drawable/linear_divider.xml
View file

0
vector/src/debug/res/layout/activity_debug_button_styles.xml → library/ui-styles/src/debug/res/layout/activity_debug_button_styles.xml
View file

20
vector/src/debug/res/layout/activity_test_material_theme.xml → library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml
View file

@ -330,7 +330,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Classic"
app:icon="@drawable/ic_settings_x" />
app:icon="@drawable/ic_debug_icon" />
<Button
style="@style/Widget.MaterialComponents.Button"
@ -338,14 +338,14 @@
android:layout_height="wrap_content"
android:enabled="false"
android:text="Classic Disabled"
app:icon="@drawable/ic_settings_x" />
app:icon="@drawable/ic_debug_icon" />
<Button
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="OutlinedButton"
app:icon="@drawable/ic_settings_x" />
app:icon="@drawable/ic_debug_icon" />
<Button
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
@ -353,14 +353,14 @@
android:layout_height="wrap_content"
android:enabled="false"
android:text="OutlinedButton Disabled"
app:icon="@drawable/ic_settings_x" />
app:icon="@drawable/ic_debug_icon" />
<Button
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextButton"
app:icon="@drawable/ic_settings_x" />
app:icon="@drawable/ic_debug_icon" />
<Button
style="@style/Widget.MaterialComponents.Button.TextButton"
@ -368,14 +368,14 @@
android:layout_height="wrap_content"
android:enabled="false"
android:text="TextButton Disabled"
app:icon="@drawable/ic_settings_x" />
app:icon="@drawable/ic_debug_icon" />
<Button
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="UnelevatedButton"
app:icon="@drawable/ic_settings_x" />
app:icon="@drawable/ic_debug_icon" />
<Button
style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
@ -383,7 +383,7 @@
android:layout_height="wrap_content"
android:enabled="false"
android:text="UnelevatedButton Disabled"
app:icon="@drawable/ic_settings_x" />
app:icon="@drawable/ic_debug_icon" />
<TextView
android:layout_width="wrap_content"
@ -457,12 +457,12 @@
android:layout_gravity="end"
android:layout_margin="16dp"
android:importantForAccessibility="no"
android:src="@drawable/ic_settings_x" />
android:src="@drawable/ic_debug_icon" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:menu="@menu/home_bottom_navigation" />
app:menu="@menu/menu_debug" />
</LinearLayout>

0
vector/src/debug/res/layout/debug_text_view.xml → library/ui-styles/src/debug/res/layout/debug_text_view.xml
View file

19
library/ui-styles/src/debug/res/menu/menu_debug.xml Normal file
View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="HardcodedText">
<item
android:id="@+id/menuDebug1"
android:icon="@drawable/ic_debug_icon"
android:title="Edit"
app:showAsAction="never" />
<item
android:id="@+id/menuDebug2"
android:icon="@drawable/ic_debug_icon"
android:title="Send"
app:showAsAction="always" />
</menu>

0
vector/src/debug/res/values/debug_styles.xml → library/ui-styles/src/debug/res/values/debug_styles.xml
View file

2
library/ui-styles/src/main/AndroidManifest.xml
View file

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="im.vector.app.ui.styles"/>
<manifest package="im.vector.lib.ui.styles"/>

0
vector/src/release/res/values/styles.xml → library/ui-styles/src/release/res/values/styles.xml
View file

21
vector/src/debug/AndroidManifest.xml
View file

@ -5,27 +5,6 @@
<application>
<activity android:name=".features.debug.TestLinkifyActivity" />
<activity android:name=".features.debug.sas.DebugSasEmojiActivity" />
<activity
android:name=".features.debug.DebugMaterialThemeLightDefaultActivity"
android:theme="@style/VectorMaterialThemeDebugLight" />
<activity
android:name=".features.debug.DebugMaterialThemeLightTestActivity"
android:theme="@style/VectorMaterialThemeDebugLight.Test" />
<activity
android:name=".features.debug.DebugMaterialThemeLightVectorActivity"
android:theme="@style/AppTheme.Light" />
<activity
android:name=".features.debug.DebugMaterialThemeDarkDefaultActivity"
android:theme="@style/VectorMaterialThemeDebugDark" />
<activity
android:name=".features.debug.DebugMaterialThemeDarkTestActivity"
android:theme="@style/VectorMaterialThemeDebugDark.Test" />
<activity
android:name=".features.debug.DebugMaterialThemeDarkVectorActivity"
android:theme="@style/AppTheme.Dark" />
<activity
android:name=".features.debug.DebugVectorButtonStylesActivity"
android:theme="@style/AppTheme.Light" />
</application>
</manifest>

7
vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
View file

@ -37,6 +37,13 @@ import im.vector.app.core.utils.toast
import im.vector.app.databinding.ActivityDebugMenuBinding
import im.vector.app.features.debug.sas.DebugSasEmojiActivity
import im.vector.app.features.qrcode.QrCodeScannerActivity
import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkDefaultActivity
import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkTestActivity
import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkVectorActivity
import im.vector.lib.ui.styles.debug.DebugMaterialThemeLightDefaultActivity
import im.vector.lib.ui.styles.debug.DebugMaterialThemeLightTestActivity
import im.vector.lib.ui.styles.debug.DebugMaterialThemeLightVectorActivity
import im.vector.lib.ui.styles.debug.DebugVectorButtonStylesActivity
import org.matrix.android.sdk.internal.crypto.verification.qrcode.toQrCodeData
import timber.log.Timber

17
vector/src/debug/res/menu/menu_debug.xml
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menuDebug1"
android:icon="@drawable/ic_edit"
android:title="@string/edit"
app:showAsAction="never" />
<item
android:id="@+id/menuDebug2"
android:icon="@drawable/ic_send"
android:title="@string/send"
app:showAsAction="always" />
</menu>