diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9503dec --- /dev/null +++ b/.gitignore @@ -0,0 +1,97 @@ + +# Created by https://www.gitignore.io/api/android +# Edit at https://www.gitignore.io/?templates=android + +### Android ### +# Built application files +*.apk +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ +release/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +# Android Studio 3 in .gitignore file. +.idea/caches +.idea/modules.xml +# Comment next line if keeping position of elements in Navigation Editor is relevant for you +.idea/navEditor.xml + +# Keystore files +# Uncomment the following lines if you do not want to check your keystore files in. +#*.jks +#*.keystore + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# Google Services (e.g. APIs or Firebase) +# google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md + +# Version control +vcs.xml + +# lint +lint/intermediates/ +lint/generated/ +lint/outputs/ +lint/tmp/ +# lint/reports/ + +### Android Patch ### +gen-external-apklibs +output.json + +# Replacement of .externalNativeBuild directories introduced +# with Android Studio 3.5. +.cxx/ + +# End of https://www.gitignore.io/api/android diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..40ed937 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..af0bbdd --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..08bf1bb --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,40 @@ +apply plugin: 'com.android.application' + +apply plugin: 'kotlin-android' + +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.3" + defaultConfig { + applicationId "xyz.lgvalle.surfaceduosample" + minSdkVersion 29 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation project(path: ':utils') + implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.core:core-ktx:1.0.2' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation 'androidx.appcompat:appcompat:1.1.0' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/xyz/lgvalle/surfaceduosample/ExampleInstrumentedTest.kt b/app/src/androidTest/java/xyz/lgvalle/surfaceduosample/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..ba9564d --- /dev/null +++ b/app/src/androidTest/java/xyz/lgvalle/surfaceduosample/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package xyz.lgvalle.surfaceduosample + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("xyz.lgvalle.surfaceduosample", appContext.packageName) + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..903f661 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + diff --git a/app/src/main/java/xyz/lgvalle/surfaceduosample/MainActivity.kt b/app/src/main/java/xyz/lgvalle/surfaceduosample/MainActivity.kt new file mode 100644 index 0000000..9780da2 --- /dev/null +++ b/app/src/main/java/xyz/lgvalle/surfaceduosample/MainActivity.kt @@ -0,0 +1,77 @@ +package xyz.lgvalle.surfaceduosample + +import android.content.res.Configuration +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import com.microsoft.device.display.samples.utils.ScreenHelper +import xyz.lgvalle.surfaceduosample.ui.main.Item +import xyz.lgvalle.surfaceduosample.ui.main.ItemFragmentDetails +import xyz.lgvalle.surfaceduosample.ui.main.ItemFragmentList +import xyz.lgvalle.surfaceduosample.ui.main.ItemViewModel + +class MainActivity : AppCompatActivity() { + + private val screenHelper = ScreenHelper() + private val isDuoDevice by lazy { screenHelper.initialize(this) } + private val viewModel by lazy { ViewModelProviders.of(this).get(ItemViewModel::class.java) } + + private val dualModeIds = LayoutIdReference( + layoutId = R.layout.main_activity_dual_mode, + list = R.id.master_main, + details = R.id.master_detail + ) + private val singleModelIds = LayoutIdReference( + layoutId = R.layout.main_activity_single_mode, + list = R.id.container, + details = R.id.container + ) + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setupLayout() + } + + override fun onConfigurationChanged(newConfig: Configuration) { + super.onConfigurationChanged(newConfig) + setupLayout() + } + + private fun setupLayout() { + showItemList(getLayoutIds()) + viewModel.selectedItem.observe(this@MainActivity, Observer { + it?.let { showItemDetails(it) } + }) + } + + private fun showItemList(ids: LayoutIdReference) { + setContentView(ids.layoutId) + + supportFragmentManager.beginTransaction() + .replace(ids.list, ItemFragmentList.newInstance()) + .commitNow() + } + + private fun showItemDetails(item: Item) { + val fragmentDetails = ItemFragmentDetails.newInstance(item) + + supportFragmentManager.beginTransaction() + .add(getLayoutIds().details, fragmentDetails) + .addToBackStack(fragmentDetails.javaClass.name) + .commit() + } + + override fun onBackPressed() { + super.onBackPressed() + viewModel.deselectAny() + } + + private fun getLayoutIds() = when { + isDuoDevice && screenHelper.isDualMode -> dualModeIds + else -> singleModelIds + } + + private data class LayoutIdReference(val layoutId: Int, val list: Int, val details: Int) +} + diff --git a/app/src/main/java/xyz/lgvalle/surfaceduosample/ui/main/ItemFragmentDetails.kt b/app/src/main/java/xyz/lgvalle/surfaceduosample/ui/main/ItemFragmentDetails.kt new file mode 100644 index 0000000..c653a38 --- /dev/null +++ b/app/src/main/java/xyz/lgvalle/surfaceduosample/ui/main/ItemFragmentDetails.kt @@ -0,0 +1,42 @@ +package xyz.lgvalle.surfaceduosample.ui.main + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import kotlinx.android.synthetic.main.fragment_item_detail.view.* +import xyz.lgvalle.surfaceduosample.R + +class ItemFragmentDetails : Fragment() { + private var item: Item? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + arguments?.let { + item = it.getSerializable("item") as Item + } + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.fragment_item_detail, container, false) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + view.apply { + this.tvTitle.text = item?.id + this.tvBody.text = item?.content + } + } + + companion object { + fun newInstance(item: Item) = + ItemFragmentDetails().apply { + arguments = Bundle().apply { putSerializable("item", item) } + } + } +} diff --git a/app/src/main/java/xyz/lgvalle/surfaceduosample/ui/main/ItemFragmentList.kt b/app/src/main/java/xyz/lgvalle/surfaceduosample/ui/main/ItemFragmentList.kt new file mode 100644 index 0000000..9c315b4 --- /dev/null +++ b/app/src/main/java/xyz/lgvalle/surfaceduosample/ui/main/ItemFragmentList.kt @@ -0,0 +1,41 @@ +package xyz.lgvalle.surfaceduosample.ui.main + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProviders +import androidx.recyclerview.widget.LinearLayoutManager +import kotlinx.android.synthetic.main.fragment_item_list.view.* +import xyz.lgvalle.surfaceduosample.R + +class ItemFragmentList : Fragment() { + + private val viewModel by lazy { + activity?.let { ViewModelProviders.of(it).get(ItemViewModel::class.java) } + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.fragment_item_list, container, false) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + view.item_list.layoutManager = LinearLayoutManager(this@ItemFragmentList.context) + + viewModel?.apply { + items.observe(viewLifecycleOwner, Observer { items -> + view.item_list.adapter = ItemListViewAdapter(items) { item -> selectItem(item) } + }) + } + } + + companion object { + fun newInstance() = ItemFragmentList() + } +} diff --git a/app/src/main/java/xyz/lgvalle/surfaceduosample/ui/main/ItemListViewAdapter.kt b/app/src/main/java/xyz/lgvalle/surfaceduosample/ui/main/ItemListViewAdapter.kt new file mode 100644 index 0000000..1b50688 --- /dev/null +++ b/app/src/main/java/xyz/lgvalle/surfaceduosample/ui/main/ItemListViewAdapter.kt @@ -0,0 +1,33 @@ +package xyz.lgvalle.surfaceduosample.ui.main + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import kotlinx.android.synthetic.main.fragment_item.view.* +import xyz.lgvalle.surfaceduosample.R + +class ItemListViewAdapter( + private val mValues: List, + private val mListener: (Item) -> Unit +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder( + LayoutInflater.from(parent.context).inflate(R.layout.fragment_item, parent, false) + ) + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + val item = mValues[position] + holder.mIdView.text = item.id + holder.mContentView.text = item.content + holder.mView.setOnClickListener { mListener.invoke(item) } + } + + override fun getItemCount(): Int = mValues.size + + inner class ViewHolder(val mView: View) : RecyclerView.ViewHolder(mView) { + val mIdView: TextView = mView.item_id + val mContentView: TextView = mView.item_content + } +} diff --git a/app/src/main/java/xyz/lgvalle/surfaceduosample/ui/main/ItemViewModel.kt b/app/src/main/java/xyz/lgvalle/surfaceduosample/ui/main/ItemViewModel.kt new file mode 100644 index 0000000..fccf34b --- /dev/null +++ b/app/src/main/java/xyz/lgvalle/surfaceduosample/ui/main/ItemViewModel.kt @@ -0,0 +1,34 @@ +package xyz.lgvalle.surfaceduosample.ui.main + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import java.io.Serializable + +class ItemViewModel : ViewModel() { + private val _selectedItem: MutableLiveData = MutableLiveData() + val selectedItem: LiveData = _selectedItem + + private val _items = MutableLiveData>().apply { postValue(ITEMS) } + val items: LiveData> = _items + + fun selectItem(item: Item): Item? { + return ITEMS + .find { it == item } + ?.also { _selectedItem.postValue(it) } + } + + fun deselectAny() { + _selectedItem.postValue(null) + } + + companion object { + val ITEMS = listOf( + Item("Item 1", "This is the first item"), + Item("Item 2", "This is the second item"), + Item("Item 3", "This is the third item") + ) + } +} + +data class Item(val id: String, val content: String) : Serializable diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f6bb29 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout-land/main_activity_dual_mode.xml b/app/src/main/res/layout-land/main_activity_dual_mode.xml new file mode 100644 index 0000000..24a268d --- /dev/null +++ b/app/src/main/res/layout-land/main_activity_dual_mode.xml @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_item.xml b/app/src/main/res/layout/fragment_item.xml new file mode 100644 index 0000000..7299cbb --- /dev/null +++ b/app/src/main/res/layout/fragment_item.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/app/src/main/res/layout/fragment_item_detail.xml b/app/src/main/res/layout/fragment_item_detail.xml new file mode 100644 index 0000000..d132715 --- /dev/null +++ b/app/src/main/res/layout/fragment_item_detail.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_item_list.xml b/app/src/main/res/layout/fragment_item_list.xml new file mode 100644 index 0000000..090be7c --- /dev/null +++ b/app/src/main/res/layout/fragment_item_list.xml @@ -0,0 +1,13 @@ + + diff --git a/app/src/main/res/layout/main_activity_dual_mode.xml b/app/src/main/res/layout/main_activity_dual_mode.xml new file mode 100644 index 0000000..16e424f --- /dev/null +++ b/app/src/main/res/layout/main_activity_dual_mode.xml @@ -0,0 +1,28 @@ + + + + + + + + + + diff --git a/app/src/main/res/layout/main_activity_single_mode.xml b/app/src/main/res/layout/main_activity_single_mode.xml new file mode 100644 index 0000000..1de2219 --- /dev/null +++ b/app/src/main/res/layout/main_activity_single_mode.xml @@ -0,0 +1,7 @@ + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6b78462 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6b78462 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..898f3ed Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..dffca36 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..64ba76f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..dae5e08 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..e5ed465 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..14ed0af Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..b0907ca Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d8ae031 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..2c18de9 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..beed3cd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..a591b6f --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,9 @@ + + + #008577 + #00574B + #D81B60 + #9E9E9E + + #4cb5a6 + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..2926000 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,4 @@ + + + 16dp + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..8df5624 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,9 @@ + + Master/Detail Kotlin Sample + + Hello blank fragment + Rating: + Details: + Title: + Item image + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/test/java/xyz/lgvalle/surfaceduosample/ExampleUnitTest.kt b/app/src/test/java/xyz/lgvalle/surfaceduosample/ExampleUnitTest.kt new file mode 100644 index 0000000..ee2dfbb --- /dev/null +++ b/app/src/test/java/xyz/lgvalle/surfaceduosample/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package xyz.lgvalle.surfaceduosample + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..eccd7a6 --- /dev/null +++ b/build.gradle @@ -0,0 +1,28 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext.kotlin_version = '1.3.50' + repositories { + google() + jcenter() + + } + dependencies { + classpath 'com.android.tools.build:gradle:3.5.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..23339e0 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..8809bae --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Feb 10 15:51:43 CET 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..1f76d8a --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include ':app', ':utils' +rootProject.name='SurfaceDuoSample' diff --git a/utils/.gitignore b/utils/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/utils/.gitignore @@ -0,0 +1 @@ +/build diff --git a/utils/build.gradle b/utils/build.gradle new file mode 100644 index 0000000..8721a64 --- /dev/null +++ b/utils/build.gradle @@ -0,0 +1,48 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.2" + + + defaultConfig { + minSdkVersion 29 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles 'consumer-rules.pro' + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + splits { + // Configures multiple APKs based on ABI. + abi { + // Enables building multiple APKs per ABI. + enable true + // By default all ABIs are included, so use reset() and include to specify that we only + // want APKs for x86 and x86_64. + // Resets the list of ABIs that Gradle should create APKs for to none. + reset() + // Specifies a list of ABIs that Gradle should create APKs for. + include "x86", "x86_64", "armeabi-v7a", "arm64-v8a" + // Specifies that we do not want to also generate a universal APK that includes all ABIs. + universalApk false + } + } +} + +dependencies { + compileOnly fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.1.0' + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} diff --git a/utils/consumer-rules.pro b/utils/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/utils/libs/com.microsoft.device.display.displaymask.jar b/utils/libs/com.microsoft.device.display.displaymask.jar new file mode 100644 index 0000000..aabaf5e Binary files /dev/null and b/utils/libs/com.microsoft.device.display.displaymask.jar differ diff --git a/utils/proguard-rules.pro b/utils/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/utils/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/utils/src/androidTest/java/com/microsoft/device/display/samples/utils/ExampleInstrumentedTest.java b/utils/src/androidTest/java/com/microsoft/device/display/samples/utils/ExampleInstrumentedTest.java new file mode 100644 index 0000000..91c702e --- /dev/null +++ b/utils/src/androidTest/java/com/microsoft/device/display/samples/utils/ExampleInstrumentedTest.java @@ -0,0 +1,27 @@ +package com.microsoft.device.display.samples.utils; + +import android.content.Context; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.assertEquals; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + + assertEquals("com.microsoft.device.display.samples.utils.test", appContext.getPackageName()); + } +} diff --git a/utils/src/main/AndroidManifest.xml b/utils/src/main/AndroidManifest.xml new file mode 100644 index 0000000..68fe3a4 --- /dev/null +++ b/utils/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/utils/src/main/java/com/microsoft/device/display/samples/utils/ScreenHelper.java b/utils/src/main/java/com/microsoft/device/display/samples/utils/ScreenHelper.java new file mode 100644 index 0000000..3820f0c --- /dev/null +++ b/utils/src/main/java/com/microsoft/device/display/samples/utils/ScreenHelper.java @@ -0,0 +1,105 @@ +/* + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. + */ + +package com.microsoft.device.display.samples.utils; + +import android.app.Activity; +import android.content.Context; +import android.graphics.Rect; +import android.view.WindowManager; + +import com.microsoft.device.display.DisplayMask; + +import java.util.List; + +public class ScreenHelper { + private DisplayMask mDisplayMask; + private Activity mActivity; + + public boolean initialize(Activity activity) { + try { + mActivity = activity; + mDisplayMask = DisplayMask.fromResourcesRectApproximation(mActivity); + if (mDisplayMask == null) { + return false; + } + } catch (NoSuchMethodError | RuntimeException | NoClassDefFoundError ex) { + ex.printStackTrace(); + return false; + } + return true; + } + + private int getRotation() { + return getRotation(mActivity); + } + + private Rect getHinge(int rotation) { + // Hinge's coordinates of its 4 edges in different mode + // Double Landscape Rect(0, 1350 - 1800, 1434) + // Double Portrait Rect(1350, 0 - 1434, 1800) + List boundings = mDisplayMask.getBoundingRectsForRotation(rotation); + return boundings.get(0); + } + + private Rect getWindowRect() { + Rect windowRect = new Rect(); + mActivity.getWindowManager().getDefaultDisplay().getRectSize(windowRect); + return windowRect; + } + + private void getScreenRects(Rect windowRect, Rect hinge, Rect screenRect1, Rect screenRect2) { + // Hinge's coordinates of its 4 edges in different mode + // Double Landscape Rect(0, 1350 - 1800, 1434) + // Double Portrait Rect(1350, 0 - 1434, 1800) + if (hinge.left > 0) { + screenRect1.left = 0; + screenRect1.right = hinge.left; + screenRect1.top = 0; + screenRect1.bottom = windowRect.bottom; + screenRect2.left = hinge.right; + screenRect2.right = windowRect.right; + screenRect2.top = 0; + screenRect2.bottom = windowRect.bottom; + } else { + screenRect1.left = 0; + screenRect1.right = windowRect.right; + screenRect1.top = 0; + screenRect1.bottom = hinge.top; + screenRect2.left = 0; + screenRect2.right = windowRect.right; + screenRect2.top = hinge.bottom; + screenRect2.bottom = windowRect.bottom; + } + } + + public void getScreenRects(Rect screenRect1, Rect screenRect2, int rotation) { + Rect hinge = getHinge(rotation); + Rect windowRect = getWindowRect(); + getScreenRects(windowRect, hinge, screenRect1, screenRect2); + } + + public boolean isDualMode() { + int rotation = getRotation(); + Rect hinge = getHinge(rotation); + Rect windowRect = getWindowRect(); + + if (windowRect.width() > 0 && windowRect.height() > 0) { + // The windowRect doesn't intersect hinge + return hinge.intersect(windowRect); + } + + return false; + } + + public static int getRotation(Activity activity) { + WindowManager wm = (WindowManager) activity.getSystemService(Context.WINDOW_SERVICE); + int rotation = 0; + if (wm != null) { + rotation = wm.getDefaultDisplay().getRotation(); + } + return rotation; + } +} diff --git a/utils/src/main/res/values/strings.xml b/utils/src/main/res/values/strings.xml new file mode 100644 index 0000000..3ad9c84 --- /dev/null +++ b/utils/src/main/res/values/strings.xml @@ -0,0 +1,8 @@ + + + + utils + diff --git a/utils/src/test/java/com/microsoft/device/display/samples/utils/ExampleUnitTest.java b/utils/src/test/java/com/microsoft/device/display/samples/utils/ExampleUnitTest.java new file mode 100644 index 0000000..aa94120 --- /dev/null +++ b/utils/src/test/java/com/microsoft/device/display/samples/utils/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.microsoft.device.display.samples.utils; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file