Skip to content

Commit

Permalink
chroe: update demo, add more samples
Browse files Browse the repository at this point in the history
  • Loading branch information
qii committed Oct 26, 2019
1 parent dc49fa8 commit b2f0f93
Show file tree
Hide file tree
Showing 58 changed files with 1,053 additions and 1,040 deletions.
17 changes: 9 additions & 8 deletions demo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.bytedance.scenedemo">
xmlns:tools="http://schemas.android.com/tools"
package="com.bytedance.scenedemo">

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
Expand All @@ -14,20 +13,22 @@
tools:ignore="GoogleAppIndexingWarning">
<activity
android:name=".MainActivity"
android:windowSoftInputMode="adjustNothing"
android:configChanges="orientation|screenSize|keyboardHidden">
android:configChanges="orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustNothing">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".navigation.performance.EmptyActivity" />
<activity android:name=".group.fragment.FragmentBindingDemoActivity" />
<activity android:name=".group.fragment.TestSceneToViewActivity" />
<activity android:name=".migrate.FragmentBindingDemoActivity" />
<activity android:name=".migrate.TestSceneToViewActivity" />
<activity android:name="com.bytedance.scenedemo.navigation.forresult.TestActivityResultActivity" />
<activity android:name="com.bytedance.scenedemo.navigation.forresult.ActivityToSceneDemoActivity" />
<activity android:name="com.bytedance.scenedemo.activity_compatibility.scene_result.ActivityGetSceneResultSampleActivity" />
<activity android:name=".restore.SupportRestoreActivity" />
<activity android:name=".migrate.migrate_from_classic_activity_fragment.MigrateFromClassicAndroidActivitySamplesActivity" />
</application>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
package com.bytedance.scenedemo

import android.Manifest
import android.content.Intent
import android.content.pm.PackageManager
import android.os.Build
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.ScrollView
import android.widget.Toast
import com.bytedance.scene.Scene
import com.bytedance.scene.interfaces.PermissionResultCallback
import com.bytedance.scene.ktx.requestPermissions
import com.bytedance.scenedemo.activity_compatibility.activity_result.SceneGetActivityResultSample
import com.bytedance.scenedemo.activity_compatibility.configuration.ConfigurationDemoScene
import com.bytedance.scenedemo.activity_compatibility.softkeyboard.SoftKeyboardDemoScene
import com.bytedance.scenedemo.activity_compatibility.theme.ThemeDemo
import com.bytedance.scenedemo.activity_compatibility.window.WindowDemo
import com.bytedance.scenedemo.activity_compatibility.scene_result.ActivityGetSceneResultSampleActivity
import com.bytedance.scenedemo.utility.addButton
import com.bytedance.scenedemo.utility.addClassPathTitle
import com.bytedance.scenedemo.utility.addSpace
import com.bytedance.scenedemo.utility.addTitle


class ActivityCompatibilitySamples : Scene() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup, savedInstanceState: Bundle?): View {
val scrollView = ScrollView(requireSceneContext())

val layout = LinearLayout(requireSceneContext())
layout.orientation = LinearLayout.VERTICAL

scrollView.addView(layout)

addClassPathTitle(layout)
addSpace(layout, 12)
addTitle(layout, getString(R.string.main_title_basic))

addButton(layout, getString(R.string.main_activity_btn_scene_get_activity_result), View.OnClickListener {
requireNavigationScene().push(SceneGetActivityResultSample::class.java)
})
addButton(layout, getString(R.string.main_activity_btn_activity_get_scene_result), View.OnClickListener {
requireNavigationScene().startActivity(Intent(requireActivity(), ActivityGetSceneResultSampleActivity::class.java))
})
addButton(layout, getString(R.string.nav_result_permission), View.OnClickListener {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
requestPermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 123, PermissionResultCallback {
if (it != null && it.isNotEmpty()
&& it[0] == PackageManager.PERMISSION_GRANTED) {
Toast.makeText(activity, getString(R.string.nav_result_permission_tip_success), Toast.LENGTH_SHORT).show()
} else {
Toast.makeText(activity, getString(R.string.nav_result_permission_tip_failed), Toast.LENGTH_SHORT).show()
}
})
}
})
addButton(layout, getString(R.string.main_nav_btn_configuration_change), View.OnClickListener {
requireNavigationScene().push(ConfigurationDemoScene::class.java)
})
addButton(layout, getString(R.string.main_nav_btn_ime), View.OnClickListener {
requireNavigationScene().push(SoftKeyboardDemoScene::class.java)
})
addButton(layout, getString(R.string.main_nav_btn_theme), View.OnClickListener {
requireNavigationScene().push(ThemeDemo::class.java)
})

addButton(layout, getString(R.string.main_nav_btn_modify_activity_states), View.OnClickListener {
requireNavigationScene().push(WindowDemo::class.java)
})

addSpace(layout, 100)

return scrollView
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.bytedance.scenedemo.animation;
package com.bytedance.scenedemo;

import android.os.Bundle;
import android.support.annotation.NonNull;
Expand All @@ -12,14 +12,17 @@
import android.widget.TextView;

import com.bytedance.scene.group.UserVisibleHintGroupScene;
import com.bytedance.scenedemo.R;
import com.bytedance.scenedemo.animation.AnimationResDemoScene;
import com.bytedance.scenedemo.animation.SlideBackButtonDemoScene;
import com.bytedance.scenedemo.animation.SwipeBackDemo;
import com.bytedance.scenedemo.animation.TransitionDemo;

/**
* Created by JiangQi on 8/9/18.
*/
public class AnimationListDemoScene extends UserVisibleHintGroupScene {

Button mInteractionButton;
public Button mInteractionButton;

@NonNull
@Override
Expand Down
12 changes: 6 additions & 6 deletions demo/src/main/java/com/bytedance/scenedemo/CaseListDemo.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
import android.widget.TextView;

import com.bytedance.scene.group.UserVisibleHintGroupScene;
import com.bytedance.scenedemo.case0.Case0Scene;
import com.bytedance.scenedemo.case0.Case1Scene;
import com.bytedance.scenedemo.case0.Case2Scene;
import com.bytedance.scenedemo.case0.Case3Scene;
import com.bytedance.scenedemo.case0.Case4Scene;
import com.bytedance.scenedemo.case0.Case5Scene;
import com.bytedance.scenedemo.extreme_case.Case0Scene;
import com.bytedance.scenedemo.extreme_case.Case1Scene;
import com.bytedance.scenedemo.extreme_case.Case2Scene;
import com.bytedance.scenedemo.extreme_case.Case3Scene;
import com.bytedance.scenedemo.extreme_case.Case4Scene;
import com.bytedance.scenedemo.extreme_case.Case5Scene;
import com.bytedance.scenedemo.restore.SupportRestoreActivity;

/**
Expand Down
53 changes: 53 additions & 0 deletions demo/src/main/java/com/bytedance/scenedemo/DialogSamples.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package com.bytedance.scenedemo

import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.ScrollView
import android.widget.Toast
import com.bytedance.scene.Scene
import com.bytedance.scene.animation.animatorexecutor.DialogSceneAnimatorExecutor
import com.bytedance.scene.interfaces.PushOptions
import com.bytedance.scenedemo.dialog.DemoDialogScene
import com.bytedance.scenedemo.dialog.DemoDialogWithDimScene
import com.bytedance.scenedemo.utility.addButton
import com.bytedance.scenedemo.utility.addClassPathTitle
import com.bytedance.scenedemo.utility.addSpace
import com.bytedance.scenedemo.utility.addTitle


class DialogSamples : Scene() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup, savedInstanceState: Bundle?): View {
val scrollView = ScrollView(activity)

val layout = LinearLayout(activity)
layout.orientation = LinearLayout.VERTICAL

scrollView.addView(layout)

addClassPathTitle(layout)
addSpace(layout, 12)
addTitle(layout, getString(R.string.main_title_basic))

addButton(layout, getString(R.string.part_dialog_btn_1), View.OnClickListener {
requireNavigationScene().push(DemoDialogScene::class.java, null, PushOptions.Builder()
.setTranslucent(true).setAnimation(DialogSceneAnimatorExecutor()).build())
})
addButton(layout, getString(R.string.part_dialog_btn_2), View.OnClickListener {
requireNavigationScene().push(DemoDialogWithDimScene::class.java, null, PushOptions.Builder()
.setTranslucent(true).setAnimation(DialogSceneAnimatorExecutor()).build())
})
addButton(layout, getString(R.string.part_dialog_btn_3), View.OnClickListener {
Toast.makeText(requireApplicationContext(),"TODO",Toast.LENGTH_SHORT).show()
})
addButton(layout, getString(R.string.main_part_btn_floating_window), View.OnClickListener {
Toast.makeText(requireApplicationContext(),"TODO",Toast.LENGTH_SHORT).show()
})

addSpace(layout, 100)

return scrollView
}
}
154 changes: 0 additions & 154 deletions demo/src/main/java/com/bytedance/scenedemo/GroupListDemo.java

This file was deleted.

Loading

0 comments on commit b2f0f93

Please sign in to comment.