├── app ├── .gitignore ├── src │ ├── main │ │ ├── res │ │ │ ├── values │ │ │ │ ├── strings.xml │ │ │ │ ├── dimens.xml │ │ │ │ ├── colors.xml │ │ │ │ └── styles.xml │ │ │ ├── mipmap-hdpi │ │ │ │ ├── ic_launcher.png │ │ │ │ └── ic_launcher_round.png │ │ │ ├── mipmap-mdpi │ │ │ │ ├── ic_launcher.png │ │ │ │ └── ic_launcher_round.png │ │ │ ├── mipmap-xhdpi │ │ │ │ ├── ic_launcher.png │ │ │ │ └── ic_launcher_round.png │ │ │ ├── mipmap-xxhdpi │ │ │ │ ├── ic_launcher.png │ │ │ │ └── ic_launcher_round.png │ │ │ ├── mipmap-xxxhdpi │ │ │ │ ├── ic_launcher.png │ │ │ │ └── ic_launcher_round.png │ │ │ ├── drawable │ │ │ │ ├── bookmark_background_selected.xml │ │ │ │ ├── bookmark_background_notselected.xml │ │ │ │ ├── bottom_toolbar_shadow.xml │ │ │ │ ├── ic_menu_black_24dp.xml │ │ │ │ ├── ic_arrow_back_black_24dp.xml │ │ │ │ ├── ic_close_black_24dp.xml │ │ │ │ ├── ic_folder_black_24dp.xml │ │ │ │ ├── ic_create_new_folder_black_24dp.xml │ │ │ │ ├── ic_more_vert_black_24dp.xml │ │ │ │ ├── ic_delete_forever_black_24dp.xml │ │ │ │ ├── ic_triangle.xml │ │ │ │ └── ic_launcher_background.xml │ │ │ ├── mipmap-anydpi-v26 │ │ │ │ ├── ic_launcher.xml │ │ │ │ └── ic_launcher_round.xml │ │ │ ├── layout │ │ │ │ ├── bottom_padding.xml │ │ │ │ ├── fragment_bookmark_list.xml │ │ │ │ ├── activity_main.xml │ │ │ │ ├── insert.xml │ │ │ │ ├── bookmark.xml │ │ │ │ └── folder.xml │ │ │ └── drawable-v24 │ │ │ │ └── ic_launcher_foreground.xml │ │ ├── java │ │ │ └── app │ │ │ │ └── videobookmarkuidemo │ │ │ │ ├── db │ │ │ │ ├── Bookmark.kt │ │ │ │ ├── AppDatabase.kt │ │ │ │ └── BookmarkDao.kt │ │ │ │ ├── BookmarkListFragmentViewModel.kt │ │ │ │ ├── MainActivityViewModel.kt │ │ │ │ ├── MainActivity.kt │ │ │ │ └── BookmarkListFragment.kt │ │ └── AndroidManifest.xml │ ├── test │ │ └── java │ │ │ └── app │ │ │ └── videobookmarkuidemo │ │ │ └── ExampleUnitTest.kt │ └── androidTest │ │ └── java │ │ └── app │ │ └── videobookmarkuidemo │ │ └── ExampleInstrumentedTest.kt ├── proguard-rules.pro └── build.gradle ├── settings.gradle ├── screenshot ├── files01.png ├── files02.png ├── files03.png ├── move1.png ├── move2.png ├── move3.png ├── multi1.png ├── multi2.png ├── multi3.png ├── multi4.png ├── reorder.gif ├── select1.png ├── select2.png ├── select3.png ├── select4.png ├── select5.png ├── dropbox01.png ├── summary01.png ├── summary02.png ├── summary03.png ├── move_to_folder.gif ├── google-play-badge.png └── select_files_in_multiple_folders.gif ├── gradle └── wrapper │ ├── gradle-wrapper.jar │ └── gradle-wrapper.properties ├── .gitignore ├── gradle.properties ├── gradlew.bat ├── README.md ├── gradlew └── LICENSE /app/.gitignore: -------------------------------------------------------------------------------- 1 | /build 2 | -------------------------------------------------------------------------------- /settings.gradle: -------------------------------------------------------------------------------- 1 | rootProject.name='Video Bookmark UI Demo' 2 | include ':app' 3 | -------------------------------------------------------------------------------- /screenshot/files01.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/files01.png -------------------------------------------------------------------------------- /screenshot/files02.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/files02.png -------------------------------------------------------------------------------- /screenshot/files03.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/files03.png -------------------------------------------------------------------------------- /screenshot/move1.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/move1.png -------------------------------------------------------------------------------- /screenshot/move2.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/move2.png -------------------------------------------------------------------------------- /screenshot/move3.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/move3.png -------------------------------------------------------------------------------- /screenshot/multi1.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/multi1.png -------------------------------------------------------------------------------- /screenshot/multi2.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/multi2.png -------------------------------------------------------------------------------- /screenshot/multi3.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/multi3.png -------------------------------------------------------------------------------- /screenshot/multi4.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/multi4.png -------------------------------------------------------------------------------- /screenshot/reorder.gif: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/reorder.gif -------------------------------------------------------------------------------- /screenshot/select1.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/select1.png -------------------------------------------------------------------------------- /screenshot/select2.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/select2.png -------------------------------------------------------------------------------- /screenshot/select3.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/select3.png -------------------------------------------------------------------------------- /screenshot/select4.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/select4.png -------------------------------------------------------------------------------- /screenshot/select5.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/select5.png -------------------------------------------------------------------------------- /screenshot/dropbox01.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/dropbox01.png -------------------------------------------------------------------------------- /screenshot/summary01.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/summary01.png -------------------------------------------------------------------------------- /screenshot/summary02.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/summary02.png -------------------------------------------------------------------------------- /screenshot/summary03.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/summary03.png -------------------------------------------------------------------------------- /screenshot/move_to_folder.gif: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/move_to_folder.gif -------------------------------------------------------------------------------- /screenshot/google-play-badge.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/google-play-badge.png -------------------------------------------------------------------------------- /app/src/main/res/values/strings.xml: -------------------------------------------------------------------------------- 1 | 2 | Video Bookmark UI Demo 3 | 4 | -------------------------------------------------------------------------------- /gradle/wrapper/gradle-wrapper.jar: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/gradle/wrapper/gradle-wrapper.jar -------------------------------------------------------------------------------- /app/src/main/res/mipmap-hdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/app/src/main/res/mipmap-hdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-mdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/app/src/main/res/mipmap-mdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xhdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/app/src/main/res/mipmap-xhdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xxhdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/app/src/main/res/mipmap-xxhdpi/ic_launcher.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xxxhdpi/ic_launcher.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png -------------------------------------------------------------------------------- /screenshot/select_files_in_multiple_folders.gif: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/screenshot/select_files_in_multiple_folders.gif -------------------------------------------------------------------------------- /app/src/main/res/mipmap-hdpi/ic_launcher_round.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/app/src/main/res/mipmap-hdpi/ic_launcher_round.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-mdpi/ic_launcher_round.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/app/src/main/res/mipmap-mdpi/ic_launcher_round.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xhdpi/ic_launcher_round.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png -------------------------------------------------------------------------------- /app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/greyduchess/bookmark_ui_demo/HEAD/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png -------------------------------------------------------------------------------- /app/src/main/res/values/dimens.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 24sp 5 | 12sp 6 | 7 | -------------------------------------------------------------------------------- /app/src/main/res/values/colors.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | #6200EE 4 | #3700B3 5 | #03DAC5 6 | 7 | -------------------------------------------------------------------------------- /app/src/main/res/drawable/bookmark_background_selected.xml: -------------------------------------------------------------------------------- 1 | 2 | 5 | 6 | 7 | -------------------------------------------------------------------------------- /app/src/main/res/drawable/bookmark_background_notselected.xml: -------------------------------------------------------------------------------- 1 | 2 | 5 | 6 | 7 | -------------------------------------------------------------------------------- /gradle/wrapper/gradle-wrapper.properties: -------------------------------------------------------------------------------- 1 | #Sat May 16 17:54:57 JST 2020 2 | distributionBase=GRADLE_USER_HOME 3 | distributionPath=wrapper/dists 4 | zipStoreBase=GRADLE_USER_HOME 5 | zipStorePath=wrapper/dists 6 | distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip 7 | -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- 1 | *.iml 2 | .gradle 3 | /local.properties 4 | /.idea/caches 5 | /.idea/libraries 6 | /.idea/modules.xml 7 | /.idea/workspace.xml 8 | /.idea/navEditor.xml 9 | /.idea/assetWizardSettings.xml 10 | .DS_Store 11 | /build 12 | /captures 13 | .externalNativeBuild 14 | .cxx 15 | /.idea/ 16 | -------------------------------------------------------------------------------- /app/src/main/res/drawable/bottom_toolbar_shadow.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 7 | -------------------------------------------------------------------------------- /app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | -------------------------------------------------------------------------------- /app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | -------------------------------------------------------------------------------- /app/src/main/res/drawable/ic_menu_black_24dp.xml: -------------------------------------------------------------------------------- 1 | 6 | 9 | 10 | -------------------------------------------------------------------------------- /app/src/main/res/drawable/ic_arrow_back_black_24dp.xml: -------------------------------------------------------------------------------- 1 | 6 | 9 | 10 | -------------------------------------------------------------------------------- /app/src/main/res/values/styles.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 10 | 11 | 12 | -------------------------------------------------------------------------------- /app/src/main/res/drawable/ic_close_black_24dp.xml: -------------------------------------------------------------------------------- 1 | 6 | 9 | 10 | -------------------------------------------------------------------------------- /app/src/main/res/drawable/ic_folder_black_24dp.xml: -------------------------------------------------------------------------------- 1 | 6 | 9 | 10 | -------------------------------------------------------------------------------- /app/src/test/java/app/videobookmarkuidemo/ExampleUnitTest.kt: -------------------------------------------------------------------------------- 1 | package app.videobookmarkuidemo 2 | 3 | import org.junit.Test 4 | 5 | import org.junit.Assert.* 6 | 7 | /** 8 | * Example local unit test, which will execute on the development machine (host). 9 | * 10 | * See [testing documentation](http://d.android.com/tools/testing). 11 | */ 12 | class ExampleUnitTest { 13 | @Test 14 | fun addition_isCorrect() { 15 | assertEquals(4, 2 + 2) 16 | } 17 | } 18 | -------------------------------------------------------------------------------- /app/src/main/java/app/videobookmarkuidemo/db/Bookmark.kt: -------------------------------------------------------------------------------- 1 | package app.videobookmarkuidemo.db 2 | 3 | import androidx.room.Entity 4 | import androidx.room.PrimaryKey 5 | import java.io.Serializable 6 | 7 | @Entity(tableName = "bookmark") 8 | data class Bookmark( 9 | @PrimaryKey(autoGenerate = true) // autoincrement 10 | val id: Int, 11 | val parentId: Int, // 0 is root 12 | val isFolder: Boolean, 13 | val sortOrder: Double, 14 | val title: String? 15 | ) : Serializable 16 | -------------------------------------------------------------------------------- /app/src/main/res/drawable/ic_create_new_folder_black_24dp.xml: -------------------------------------------------------------------------------- 1 | 6 | 9 | 10 | -------------------------------------------------------------------------------- /app/src/main/res/layout/bottom_padding.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 9 | 10 | 11 | 12 | 15 | 16 | 17 | -------------------------------------------------------------------------------- /app/src/main/res/drawable/ic_more_vert_black_24dp.xml: -------------------------------------------------------------------------------- 1 | 6 | 9 | 10 | -------------------------------------------------------------------------------- /app/src/main/res/layout/fragment_bookmark_list.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 8 | 9 | 13 | 14 | 15 | -------------------------------------------------------------------------------- /app/src/main/res/drawable/ic_delete_forever_black_24dp.xml: -------------------------------------------------------------------------------- 1 | 6 | 9 | 10 | -------------------------------------------------------------------------------- /app/src/main/res/drawable/ic_triangle.xml: -------------------------------------------------------------------------------- 1 | 6 | 15 | 16 | -------------------------------------------------------------------------------- /app/src/androidTest/java/app/videobookmarkuidemo/ExampleInstrumentedTest.kt: -------------------------------------------------------------------------------- 1 | package app.videobookmarkuidemo 2 | 3 | import androidx.test.platform.app.InstrumentationRegistry 4 | import androidx.test.ext.junit.runners.AndroidJUnit4 5 | 6 | import org.junit.Test 7 | import org.junit.runner.RunWith 8 | 9 | import org.junit.Assert.* 10 | 11 | /** 12 | * Instrumented test, which will execute on an Android device. 13 | * 14 | * See [testing documentation](http://d.android.com/tools/testing). 15 | */ 16 | @RunWith(AndroidJUnit4::class) 17 | class ExampleInstrumentedTest { 18 | @Test 19 | fun useAppContext() { 20 | // Context of the app under test. 21 | val appContext = InstrumentationRegistry.getInstrumentation().targetContext 22 | assertEquals("app.videobookmarkuidemo", appContext.packageName) 23 | } 24 | } 25 | -------------------------------------------------------------------------------- /app/proguard-rules.pro: -------------------------------------------------------------------------------- 1 | # Add project specific ProGuard rules here. 2 | # You can control the set of applied configuration files using the 3 | # proguardFiles setting in build.gradle. 4 | # 5 | # For more details, see 6 | # http://developer.android.com/guide/developing/tools/proguard.html 7 | 8 | # If your project uses WebView with JS, uncomment the following 9 | # and specify the fully qualified class name to the JavaScript interface 10 | # class: 11 | #-keepclassmembers class fqcn.of.javascript.interface.for.webview { 12 | # public *; 13 | #} 14 | 15 | # Uncomment this to preserve the line number information for 16 | # debugging stack traces. 17 | #-keepattributes SourceFile,LineNumberTable 18 | 19 | # If you keep the line number information, uncomment this to 20 | # hide the original source file name. 21 | #-renamesourcefileattribute SourceFile 22 | -------------------------------------------------------------------------------- /app/src/main/AndroidManifest.xml: -------------------------------------------------------------------------------- 1 | 2 | 4 | 5 | 12 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | -------------------------------------------------------------------------------- /app/src/main/java/app/videobookmarkuidemo/db/AppDatabase.kt: -------------------------------------------------------------------------------- 1 | package app.videobookmarkuidemo.db 2 | 3 | import android.content.Context 4 | import androidx.room.Database 5 | import androidx.room.Room 6 | import androidx.room.RoomDatabase 7 | 8 | @Database(entities = arrayOf(Bookmark::class), version = 1) 9 | abstract class AppDatabase : RoomDatabase() { 10 | abstract fun bookmarkDao(): BookmarkDao 11 | 12 | companion object { 13 | 14 | private var instance: AppDatabase? = null 15 | 16 | fun getInstance(ctx: Context): AppDatabase { 17 | if (instance == null) { 18 | instance = Room.databaseBuilder( 19 | ctx.applicationContext, 20 | AppDatabase::class.java, "database" 21 | ) 22 | .build() 23 | } 24 | return instance!! 25 | } 26 | 27 | } 28 | } -------------------------------------------------------------------------------- /app/src/main/java/app/videobookmarkuidemo/db/BookmarkDao.kt: -------------------------------------------------------------------------------- 1 | package app.videobookmarkuidemo.db 2 | 3 | import androidx.lifecycle.LiveData 4 | import androidx.room.* 5 | import app.videobookmarkuidemo.db.Bookmark 6 | 7 | @Dao 8 | interface BookmarkDao { 9 | 10 | @Query("SELECT * FROM bookmark WHERE id=:id") 11 | fun get(id: Int): LiveData 12 | 13 | @Query("SELECT * FROM bookmark WHERE parentId=:parentId ORDER BY sortOrder ASC") 14 | fun getAll(parentId: Int): LiveData> 15 | 16 | @Query("SELECT * FROM bookmark WHERE parentId=:parentId ORDER BY sortOrder ASC") 17 | fun getAllSync(parentId: Int): List 18 | 19 | @Insert(onConflict = OnConflictStrategy.REPLACE) 20 | fun insert(bookmark: Bookmark): Long 21 | 22 | @Query("UPDATE bookmark SET parentId=:parentId, sortOrder=:sortOrder WHERE id=:id") 23 | fun updateParentAndSortOrder(id: Int, parentId: Int, sortOrder: Double) 24 | 25 | } -------------------------------------------------------------------------------- /gradle.properties: -------------------------------------------------------------------------------- 1 | # Project-wide Gradle settings. 2 | # IDE (e.g. Android Studio) users: 3 | # Gradle settings configured through the IDE *will override* 4 | # any settings specified in this file. 5 | # For more details on how to configure your build environment visit 6 | # http://www.gradle.org/docs/current/userguide/build_environment.html 7 | # Specifies the JVM arguments used for the daemon process. 8 | # The setting is particularly useful for tweaking memory settings. 9 | org.gradle.jvmargs=-Xmx1536m 10 | # When configured, Gradle will run in incubating parallel mode. 11 | # This option should only be used with decoupled projects. More details, visit 12 | # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects 13 | # org.gradle.parallel=true 14 | # AndroidX package structure to make it clearer which packages are bundled with the 15 | # Android operating system, and which are packaged with your app's APK 16 | # https://developer.android.com/topic/libraries/support-library/androidx-rn 17 | android.useAndroidX=true 18 | # Automatically convert third-party libraries to use AndroidX 19 | android.enableJetifier=true 20 | # Kotlin code style for this project: "official" or "obsolete": 21 | kotlin.code.style=official 22 | -------------------------------------------------------------------------------- /app/src/main/java/app/videobookmarkuidemo/BookmarkListFragmentViewModel.kt: -------------------------------------------------------------------------------- 1 | package app.videobookmarkuidemo 2 | 3 | import android.app.Application 4 | import androidx.lifecycle.AndroidViewModel 5 | import androidx.lifecycle.MediatorLiveData 6 | import app.videobookmarkuidemo.db.AppDatabase 7 | import app.videobookmarkuidemo.db.Bookmark 8 | 9 | 10 | class BookmarkListFragmentViewModel(app: Application) : AndroidViewModel(app) { 11 | 12 | var folderId: Int? = null 13 | var started = false 14 | val bookmarkListLiveData = MediatorLiveData>() 15 | val folderInfoLiveData = MediatorLiveData() 16 | 17 | fun startLoading(folderId: Int) { 18 | this.folderId = folderId 19 | if (started) { 20 | return 21 | } 22 | started = true 23 | 24 | bookmarkListLiveData.addSource( 25 | AppDatabase.getInstance(getApplication()).bookmarkDao().getAll(folderId) 26 | ) { 27 | bookmarkListLiveData.value = it 28 | } 29 | 30 | 31 | folderInfoLiveData.addSource( 32 | AppDatabase.getInstance(getApplication()).bookmarkDao().get(folderId) 33 | ) { 34 | folderInfoLiveData.value = it 35 | } 36 | } 37 | 38 | } 39 | -------------------------------------------------------------------------------- /app/src/main/res/drawable-v24/ic_launcher_foreground.xml: -------------------------------------------------------------------------------- 1 | 7 | 8 | 9 | 15 | 18 | 21 | 22 | 23 | 24 | 30 | -------------------------------------------------------------------------------- /app/build.gradle: -------------------------------------------------------------------------------- 1 | apply plugin: 'com.android.application' 2 | apply plugin: 'kotlin-android' 3 | apply plugin: 'kotlin-android-extensions' 4 | apply plugin: 'kotlin-kapt' 5 | 6 | android { 7 | compileSdkVersion 29 8 | buildToolsVersion "29.0.2" 9 | 10 | defaultConfig { 11 | applicationId "app.videobookmarkuidemo" 12 | minSdkVersion 21 13 | targetSdkVersion 29 14 | versionCode 1 15 | versionName "1.0" 16 | 17 | testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" 18 | } 19 | 20 | buildTypes { 21 | release { 22 | minifyEnabled false 23 | proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' 24 | } 25 | } 26 | 27 | dataBinding { 28 | enabled = true 29 | } 30 | 31 | compileOptions { 32 | sourceCompatibility JavaVersion.VERSION_1_8 33 | targetCompatibility JavaVersion.VERSION_1_8 34 | } 35 | kotlinOptions { 36 | jvmTarget = "1.8" 37 | } 38 | 39 | } 40 | 41 | dependencies { 42 | implementation fileTree(dir: 'libs', include: ['*.jar']) 43 | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" 44 | implementation 'androidx.appcompat:appcompat:1.1.0' 45 | implementation 'androidx.core:core-ktx:1.2.0' 46 | implementation 'androidx.constraintlayout:constraintlayout:1.1.3' 47 | implementation 'androidx.recyclerview:recyclerview:1.1.0' 48 | implementation "android.arch.lifecycle:extensions:1.1.1" 49 | implementation "androidx.room:room-runtime:2.2.5" 50 | kapt "androidx.room:room-compiler:2.2.5" 51 | implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2' 52 | implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2' 53 | testImplementation 'junit:junit:4.12' 54 | androidTestImplementation 'androidx.test.ext:junit:1.1.1' 55 | androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' 56 | } 57 | -------------------------------------------------------------------------------- /app/src/main/res/layout/activity_main.xml: -------------------------------------------------------------------------------- 1 | 2 | 4 | 5 | 9 | 10 | 14 | 15 | 16 | 20 | 21 | 26 | 27 | 34 | 35 | 39 | 40 | 47 | 48 | 49 | 50 | 51 | 52 | -------------------------------------------------------------------------------- /app/src/main/res/layout/insert.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 8 | 9 | 17 | 18 | 22 | 23 | 32 | 33 | 47 | 48 | 49 | 50 | 51 | -------------------------------------------------------------------------------- /gradlew.bat: -------------------------------------------------------------------------------- 1 | @if "%DEBUG%" == "" @echo off 2 | @rem ########################################################################## 3 | @rem 4 | @rem Gradle startup script for Windows 5 | @rem 6 | @rem ########################################################################## 7 | 8 | @rem Set local scope for the variables with windows NT shell 9 | if "%OS%"=="Windows_NT" setlocal 10 | 11 | set DIRNAME=%~dp0 12 | if "%DIRNAME%" == "" set DIRNAME=. 13 | set APP_BASE_NAME=%~n0 14 | set APP_HOME=%DIRNAME% 15 | 16 | @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. 17 | set DEFAULT_JVM_OPTS= 18 | 19 | @rem Find java.exe 20 | if defined JAVA_HOME goto findJavaFromJavaHome 21 | 22 | set JAVA_EXE=java.exe 23 | %JAVA_EXE% -version >NUL 2>&1 24 | if "%ERRORLEVEL%" == "0" goto init 25 | 26 | echo. 27 | echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 28 | echo. 29 | echo Please set the JAVA_HOME variable in your environment to match the 30 | echo location of your Java installation. 31 | 32 | goto fail 33 | 34 | :findJavaFromJavaHome 35 | set JAVA_HOME=%JAVA_HOME:"=% 36 | set JAVA_EXE=%JAVA_HOME%/bin/java.exe 37 | 38 | if exist "%JAVA_EXE%" goto init 39 | 40 | echo. 41 | echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 42 | echo. 43 | echo Please set the JAVA_HOME variable in your environment to match the 44 | echo location of your Java installation. 45 | 46 | goto fail 47 | 48 | :init 49 | @rem Get command-line arguments, handling Windows variants 50 | 51 | if not "%OS%" == "Windows_NT" goto win9xME_args 52 | 53 | :win9xME_args 54 | @rem Slurp the command line arguments. 55 | set CMD_LINE_ARGS= 56 | set _SKIP=2 57 | 58 | :win9xME_args_slurp 59 | if "x%~1" == "x" goto execute 60 | 61 | set CMD_LINE_ARGS=%* 62 | 63 | :execute 64 | @rem Setup the command line 65 | 66 | set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar 67 | 68 | @rem Execute Gradle 69 | "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% 70 | 71 | :end 72 | @rem End local scope for the variables with windows NT shell 73 | if "%ERRORLEVEL%"=="0" goto mainEnd 74 | 75 | :fail 76 | rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of 77 | rem the _cmd.exe /c_ return code! 78 | if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 79 | exit /b 1 80 | 81 | :mainEnd 82 | if "%OS%"=="Windows_NT" endlocal 83 | 84 | :omega 85 | -------------------------------------------------------------------------------- /app/src/main/res/layout/bookmark.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 9 | 10 | 13 | 14 | 24 | 25 | 31 | 32 | 38 | 39 | 46 | 47 | 48 | 49 | 50 | 51 | 52 | 55 | 56 | 57 | 61 | 62 | 63 | -------------------------------------------------------------------------------- /app/src/main/java/app/videobookmarkuidemo/MainActivityViewModel.kt: -------------------------------------------------------------------------------- 1 | package app.videobookmarkuidemo 2 | 3 | import android.app.Application 4 | import androidx.lifecycle.AndroidViewModel 5 | import androidx.lifecycle.LiveData 6 | import androidx.lifecycle.MutableLiveData 7 | import app.videobookmarkuidemo.db.AppDatabase 8 | import app.videobookmarkuidemo.db.Bookmark 9 | import app.videobookmarkuidemo.db.BookmarkDao 10 | import kotlinx.coroutines.* 11 | 12 | class MainActivityViewModel(app: Application) : AndroidViewModel(app) { 13 | 14 | private val _currentFolder = MutableLiveData() 15 | val currentFolder: LiveData // nullならroot。 16 | get() = _currentFolder 17 | private var _selectedBookmark = arrayListOf() 18 | val selectedBookmarkNum = MutableLiveData() 19 | 20 | fun setCurrentFolder(bookmark: Bookmark?) { 21 | _currentFolder.value = bookmark 22 | } 23 | 24 | fun isInSelectionMode(): Boolean { 25 | return _selectedBookmark.size > 0 26 | } 27 | 28 | fun toggleSelection(bookmark: Bookmark) { 29 | if (!_selectedBookmark.remove(bookmark.id)) { 30 | _selectedBookmark.add(bookmark.id) 31 | } 32 | selectedBookmarkNum.value = _selectedBookmark.size 33 | } 34 | 35 | fun isSelected(bookmark: Bookmark): Boolean { 36 | return _selectedBookmark.contains(bookmark.id) 37 | } 38 | 39 | fun clearSelection() { 40 | _selectedBookmark.clear() 41 | selectedBookmarkNum.value = _selectedBookmark.size 42 | } 43 | 44 | fun moveSelected(parentId: Int, sortOrderLow: Double, sortOrderHigh: Double) { 45 | val bookmarks = arrayListOf() 46 | bookmarks.addAll(_selectedBookmark) 47 | GlobalScope.launch { 48 | bookmarks.size.let { size -> 49 | if (size > 0) { 50 | // low high 51 | // |----|---|---|---|---| 52 | // lowとhighの間に3つ入れる時。3+2等分する。 53 | val delta = (sortOrderHigh - sortOrderLow) / (size + 2) 54 | AppDatabase.getInstance(getApplication()).let { db-> 55 | db.runInTransaction { 56 | for ((idx, id) in bookmarks.withIndex()) { 57 | db.bookmarkDao().updateParentAndSortOrder(id, parentId, sortOrderLow + delta * (idx + 1)) 58 | } 59 | } 60 | } 61 | } 62 | withContext(Dispatchers.Main) { 63 | clearSelection() 64 | } 65 | } 66 | 67 | } 68 | } 69 | } -------------------------------------------------------------------------------- /app/src/main/res/layout/folder.xml: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 10 | 11 | 14 | 15 | 24 | 25 | 31 | 32 | 38 | 39 | 49 | 50 | 51 | 52 | 53 | 56 | 57 | 58 | 59 | 63 | 64 | 65 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # New mobile UI for file manager type apps 2 | 3 | New mobile UI pattern for file manager type apps. It makes moving and reordering files much easier and more intuitive than traditional UI patterns. 4 | 5 | Sample code for Android is available. 6 | 7 | # How it works 8 | 9 | 10 | 11 | Long press items to select. 12 | 13 | 14 | 15 | When in selection mode, toolbar is shown at the bottom (not top. It's very important point). And "move here" buttons are shown to move items at the positions. 16 | 17 | 18 | 19 | You can nagivate to other folders even in selection mode. 20 | 21 | # Why is it better than other UI patterns? 22 | 23 | Let's compare with Google's Files app. It implements traditional item selection UI. 24 | 25 | 26 | 27 | Current folder is shown at the top. 28 | 29 | 30 | 31 | When in selection mode, top bar changes and shows how many items are selected. This implies that you can't change a folder in a selection mode. If you tap a folder, that folder is selected. It doesn't allow you to select files in more than one folders. 32 | 33 | 34 | 35 | When you tap "Move to...", it changes into dedicated destination folder selection mode. When in this mode, you cann't add or remove files from the selection. 36 | 37 | 38 | 39 | Dropbox UI has exactly the same limitation as Files app UI. 40 | 41 | # Faster reordering than drag & drop 42 | 43 | 44 | 45 | "move here" buttons in selection mode enables you easy and fast reordering. Drag & drop type reordering is cumbersome especially when moving long distance. 46 | 47 | # Demo app 48 | 49 | [](https://play.google.com/store/apps/details?id=app.bookmark.experiment) 50 | 51 | [Video Bookmark](https://play.google.com/store/apps/details?id=app.bookmark.experiment) uses a same UI as described here. 52 | It's a bookmark manager with thumbnails. It also shows video preview thumbnails for many video sharing sites. 53 | 54 | # New UI in action (old) 55 | 56 | No more slow scrolling while dragging. 57 | 58 | ![reorder](screenshot/reorder.gif) 59 | 60 | ## Move files to a folder 61 | 62 | No more dedicated folder selection view. 63 | 64 | ![move](screenshot/move_to_folder.gif) 65 | 66 | ## Select files in multiple folders 67 | 68 | You can move into a different folder while in selection mode and select multiple files. 69 | 70 | ![multiple folders](screenshot/select_files_in_multiple_folders.gif) 71 | 72 | -------------------------------------------------------------------------------- /app/src/main/java/app/videobookmarkuidemo/MainActivity.kt: -------------------------------------------------------------------------------- 1 | package app.videobookmarkuidemo 2 | 3 | import androidx.appcompat.app.AppCompatActivity 4 | import android.os.Bundle 5 | import android.view.View 6 | import androidx.databinding.DataBindingUtil 7 | import androidx.lifecycle.Observer 8 | import androidx.lifecycle.ViewModelProviders 9 | import app.thumbnailbookmark.ui.BookmarkListFragment 10 | import app.videobookmarkuidemo.databinding.ActivityMainBinding 11 | import app.videobookmarkuidemo.db.AppDatabase 12 | import app.videobookmarkuidemo.db.Bookmark 13 | import kotlinx.coroutines.GlobalScope 14 | import kotlinx.coroutines.launch 15 | 16 | class MainActivity : AppCompatActivity() { 17 | 18 | lateinit var binding: ActivityMainBinding 19 | lateinit var viewModel: MainActivityViewModel 20 | 21 | override fun onCreate(savedInstanceState: Bundle?) { 22 | super.onCreate(savedInstanceState) 23 | 24 | insertSampleDataIfDbEmpty() 25 | 26 | binding = DataBindingUtil.setContentView(this, R.layout.activity_main) 27 | 28 | if (savedInstanceState == null) { 29 | val f = BookmarkListFragment.newInstance(0) 30 | supportFragmentManager.beginTransaction().add(R.id.fragment_container, f).commit() 31 | } 32 | 33 | setSupportActionBar(binding.toolbar) 34 | 35 | supportActionBar!!.title = "" 36 | 37 | viewModel = ViewModelProviders.of(this).get(MainActivityViewModel::class.java) 38 | viewModel.currentFolder.observe(this, Observer { 39 | if (it == null) { 40 | binding.toolbar.title = "Bookmarks" 41 | binding.toolbar.setNavigationIcon(R.drawable.ic_menu_black_24dp) 42 | binding.toolbar.setNavigationOnClickListener { 43 | } 44 | } else { 45 | binding.toolbar.title = it.title 46 | binding.toolbar.setNavigationIcon(R.drawable.ic_arrow_back_black_24dp) 47 | binding.toolbar.setNavigationOnClickListener { 48 | supportFragmentManager.popBackStack() 49 | } 50 | } 51 | }) 52 | 53 | binding.bottomToolbar.visibility = View.GONE 54 | binding.bottomToolbar.setNavigationOnClickListener { v -> onBottonToolbarNavigationClicked() } 55 | 56 | viewModel.selectedBookmarkNum.observe(this, Observer { num -> 57 | if (num == 0) { 58 | binding.bottomToolbar.visibility = View.GONE 59 | } else { 60 | binding.bottomToolbar.visibility = View.VISIBLE 61 | binding.bottomToolbar.title = "${num} selected" 62 | } 63 | }) 64 | } 65 | 66 | private fun onBottonToolbarNavigationClicked() { 67 | viewModel.clearSelection() 68 | } 69 | 70 | private fun insertSampleDataIfDbEmpty() { 71 | GlobalScope.launch { 72 | val dao = AppDatabase.getInstance(application).bookmarkDao() 73 | if (dao.getAllSync(0).isEmpty()) { 74 | dao.insert(Bookmark( 75 | id = 1, 76 | parentId = 0, 77 | title = "folder 1", 78 | sortOrder = 0.0, 79 | isFolder = true 80 | )) 81 | dao.insert(Bookmark( 82 | id = 2, 83 | parentId = 0, 84 | title = "folder 2", 85 | sortOrder = 1.0, 86 | isFolder = true 87 | )) 88 | dao.insert(Bookmark( 89 | id = 3, 90 | parentId = 0, 91 | title = "folder 3", 92 | sortOrder = 2.0, 93 | isFolder = true 94 | )) 95 | dao.insert(Bookmark( 96 | id = 4, 97 | parentId = 0, 98 | title = "bookmark A", 99 | sortOrder = 3.0, 100 | isFolder = false 101 | )) 102 | dao.insert(Bookmark( 103 | id = 5, 104 | parentId = 0, 105 | title = "bookmark B", 106 | sortOrder = 4.0, 107 | isFolder = false 108 | )) 109 | dao.insert(Bookmark( 110 | id = 6, 111 | parentId = 0, 112 | title = "bookmark C", 113 | sortOrder = 5.0, 114 | isFolder = false 115 | )) 116 | dao.insert(Bookmark( 117 | id = 7, 118 | parentId = 0, 119 | title = "bookmark D", 120 | sortOrder = 6.0, 121 | isFolder = false 122 | )) 123 | } 124 | 125 | } 126 | } 127 | } 128 | -------------------------------------------------------------------------------- /gradlew: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env sh 2 | 3 | ############################################################################## 4 | ## 5 | ## Gradle start up script for UN*X 6 | ## 7 | ############################################################################## 8 | 9 | # Attempt to set APP_HOME 10 | # Resolve links: $0 may be a link 11 | PRG="$0" 12 | # Need this for relative symlinks. 13 | while [ -h "$PRG" ] ; do 14 | ls=`ls -ld "$PRG"` 15 | link=`expr "$ls" : '.*-> \(.*\)$'` 16 | if expr "$link" : '/.*' > /dev/null; then 17 | PRG="$link" 18 | else 19 | PRG=`dirname "$PRG"`"/$link" 20 | fi 21 | done 22 | SAVED="`pwd`" 23 | cd "`dirname \"$PRG\"`/" >/dev/null 24 | APP_HOME="`pwd -P`" 25 | cd "$SAVED" >/dev/null 26 | 27 | APP_NAME="Gradle" 28 | APP_BASE_NAME=`basename "$0"` 29 | 30 | # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. 31 | DEFAULT_JVM_OPTS="" 32 | 33 | # Use the maximum available, or set MAX_FD != -1 to use that value. 34 | MAX_FD="maximum" 35 | 36 | warn () { 37 | echo "$*" 38 | } 39 | 40 | die () { 41 | echo 42 | echo "$*" 43 | echo 44 | exit 1 45 | } 46 | 47 | # OS specific support (must be 'true' or 'false'). 48 | cygwin=false 49 | msys=false 50 | darwin=false 51 | nonstop=false 52 | case "`uname`" in 53 | CYGWIN* ) 54 | cygwin=true 55 | ;; 56 | Darwin* ) 57 | darwin=true 58 | ;; 59 | MINGW* ) 60 | msys=true 61 | ;; 62 | NONSTOP* ) 63 | nonstop=true 64 | ;; 65 | esac 66 | 67 | CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 68 | 69 | # Determine the Java command to use to start the JVM. 70 | if [ -n "$JAVA_HOME" ] ; then 71 | if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 72 | # IBM's JDK on AIX uses strange locations for the executables 73 | JAVACMD="$JAVA_HOME/jre/sh/java" 74 | else 75 | JAVACMD="$JAVA_HOME/bin/java" 76 | fi 77 | if [ ! -x "$JAVACMD" ] ; then 78 | die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME 79 | 80 | Please set the JAVA_HOME variable in your environment to match the 81 | location of your Java installation." 82 | fi 83 | else 84 | JAVACMD="java" 85 | which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 86 | 87 | Please set the JAVA_HOME variable in your environment to match the 88 | location of your Java installation." 89 | fi 90 | 91 | # Increase the maximum file descriptors if we can. 92 | if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then 93 | MAX_FD_LIMIT=`ulimit -H -n` 94 | if [ $? -eq 0 ] ; then 95 | if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then 96 | MAX_FD="$MAX_FD_LIMIT" 97 | fi 98 | ulimit -n $MAX_FD 99 | if [ $? -ne 0 ] ; then 100 | warn "Could not set maximum file descriptor limit: $MAX_FD" 101 | fi 102 | else 103 | warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" 104 | fi 105 | fi 106 | 107 | # For Darwin, add options to specify how the application appears in the dock 108 | if $darwin; then 109 | GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" 110 | fi 111 | 112 | # For Cygwin, switch paths to Windows format before running java 113 | if $cygwin ; then 114 | APP_HOME=`cygpath --path --mixed "$APP_HOME"` 115 | CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` 116 | JAVACMD=`cygpath --unix "$JAVACMD"` 117 | 118 | # We build the pattern for arguments to be converted via cygpath 119 | ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` 120 | SEP="" 121 | for dir in $ROOTDIRSRAW ; do 122 | ROOTDIRS="$ROOTDIRS$SEP$dir" 123 | SEP="|" 124 | done 125 | OURCYGPATTERN="(^($ROOTDIRS))" 126 | # Add a user-defined pattern to the cygpath arguments 127 | if [ "$GRADLE_CYGPATTERN" != "" ] ; then 128 | OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" 129 | fi 130 | # Now convert the arguments - kludge to limit ourselves to /bin/sh 131 | i=0 132 | for arg in "$@" ; do 133 | CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` 134 | CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option 135 | 136 | if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition 137 | eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` 138 | else 139 | eval `echo args$i`="\"$arg\"" 140 | fi 141 | i=$((i+1)) 142 | done 143 | case $i in 144 | (0) set -- ;; 145 | (1) set -- "$args0" ;; 146 | (2) set -- "$args0" "$args1" ;; 147 | (3) set -- "$args0" "$args1" "$args2" ;; 148 | (4) set -- "$args0" "$args1" "$args2" "$args3" ;; 149 | (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; 150 | (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; 151 | (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; 152 | (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; 153 | (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; 154 | esac 155 | fi 156 | 157 | # Escape application args 158 | save () { 159 | for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done 160 | echo " " 161 | } 162 | APP_ARGS=$(save "$@") 163 | 164 | # Collect all arguments for the java command, following the shell quoting and substitution rules 165 | eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" 166 | 167 | # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong 168 | if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then 169 | cd "$(dirname "$0")" 170 | fi 171 | 172 | exec "$JAVACMD" "$@" 173 | -------------------------------------------------------------------------------- /app/src/main/res/drawable/ic_launcher_background.xml: -------------------------------------------------------------------------------- 1 | 2 | 7 | 10 | 15 | 20 | 25 | 30 | 35 | 40 | 45 | 50 | 55 | 60 | 65 | 70 | 75 | 80 | 85 | 90 | 95 | 100 | 105 | 110 | 115 | 120 | 125 | 130 | 135 | 140 | 145 | 150 | 155 | 160 | 165 | 170 | 171 | -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- 1 | Apache License 2 | Version 2.0, January 2004 3 | http://www.apache.org/licenses/ 4 | 5 | TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 6 | 7 | 1. Definitions. 8 | 9 | "License" shall mean the terms and conditions for use, reproduction, 10 | and distribution as defined by Sections 1 through 9 of this document. 11 | 12 | "Licensor" shall mean the copyright owner or entity authorized by 13 | the copyright owner that is granting the License. 14 | 15 | "Legal Entity" shall mean the union of the acting entity and all 16 | other entities that control, are controlled by, or are under common 17 | control with that entity. For the purposes of this definition, 18 | "control" means (i) the power, direct or indirect, to cause the 19 | direction or management of such entity, whether by contract or 20 | otherwise, or (ii) ownership of fifty percent (50%) or more of the 21 | outstanding shares, or (iii) beneficial ownership of such entity. 22 | 23 | "You" (or "Your") shall mean an individual or Legal Entity 24 | exercising permissions granted by this License. 25 | 26 | "Source" form shall mean the preferred form for making modifications, 27 | including but not limited to software source code, documentation 28 | source, and configuration files. 29 | 30 | "Object" form shall mean any form resulting from mechanical 31 | transformation or translation of a Source form, including but 32 | not limited to compiled object code, generated documentation, 33 | and conversions to other media types. 34 | 35 | "Work" shall mean the work of authorship, whether in Source or 36 | Object form, made available under the License, as indicated by a 37 | copyright notice that is included in or attached to the work 38 | (an example is provided in the Appendix below). 39 | 40 | "Derivative Works" shall mean any work, whether in Source or Object 41 | form, that is based on (or derived from) the Work and for which the 42 | editorial revisions, annotations, elaborations, or other modifications 43 | represent, as a whole, an original work of authorship. For the purposes 44 | of this License, Derivative Works shall not include works that remain 45 | separable from, or merely link (or bind by name) to the interfaces of, 46 | the Work and Derivative Works thereof. 47 | 48 | "Contribution" shall mean any work of authorship, including 49 | the original version of the Work and any modifications or additions 50 | to that Work or Derivative Works thereof, that is intentionally 51 | submitted to Licensor for inclusion in the Work by the copyright owner 52 | or by an individual or Legal Entity authorized to submit on behalf of 53 | the copyright owner. For the purposes of this definition, "submitted" 54 | means any form of electronic, verbal, or written communication sent 55 | to the Licensor or its representatives, including but not limited to 56 | communication on electronic mailing lists, source code control systems, 57 | and issue tracking systems that are managed by, or on behalf of, the 58 | Licensor for the purpose of discussing and improving the Work, but 59 | excluding communication that is conspicuously marked or otherwise 60 | designated in writing by the copyright owner as "Not a Contribution." 61 | 62 | "Contributor" shall mean Licensor and any individual or Legal Entity 63 | on behalf of whom a Contribution has been received by Licensor and 64 | subsequently incorporated within the Work. 65 | 66 | 2. Grant of Copyright License. Subject to the terms and conditions of 67 | this License, each Contributor hereby grants to You a perpetual, 68 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable 69 | copyright license to reproduce, prepare Derivative Works of, 70 | publicly display, publicly perform, sublicense, and distribute the 71 | Work and such Derivative Works in Source or Object form. 72 | 73 | 3. Grant of Patent License. Subject to the terms and conditions of 74 | this License, each Contributor hereby grants to You a perpetual, 75 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable 76 | (except as stated in this section) patent license to make, have made, 77 | use, offer to sell, sell, import, and otherwise transfer the Work, 78 | where such license applies only to those patent claims licensable 79 | by such Contributor that are necessarily infringed by their 80 | Contribution(s) alone or by combination of their Contribution(s) 81 | with the Work to which such Contribution(s) was submitted. If You 82 | institute patent litigation against any entity (including a 83 | cross-claim or counterclaim in a lawsuit) alleging that the Work 84 | or a Contribution incorporated within the Work constitutes direct 85 | or contributory patent infringement, then any patent licenses 86 | granted to You under this License for that Work shall terminate 87 | as of the date such litigation is filed. 88 | 89 | 4. Redistribution. You may reproduce and distribute copies of the 90 | Work or Derivative Works thereof in any medium, with or without 91 | modifications, and in Source or Object form, provided that You 92 | meet the following conditions: 93 | 94 | (a) You must give any other recipients of the Work or 95 | Derivative Works a copy of this License; and 96 | 97 | (b) You must cause any modified files to carry prominent notices 98 | stating that You changed the files; and 99 | 100 | (c) You must retain, in the Source form of any Derivative Works 101 | that You distribute, all copyright, patent, trademark, and 102 | attribution notices from the Source form of the Work, 103 | excluding those notices that do not pertain to any part of 104 | the Derivative Works; and 105 | 106 | (d) If the Work includes a "NOTICE" text file as part of its 107 | distribution, then any Derivative Works that You distribute must 108 | include a readable copy of the attribution notices contained 109 | within such NOTICE file, excluding those notices that do not 110 | pertain to any part of the Derivative Works, in at least one 111 | of the following places: within a NOTICE text file distributed 112 | as part of the Derivative Works; within the Source form or 113 | documentation, if provided along with the Derivative Works; or, 114 | within a display generated by the Derivative Works, if and 115 | wherever such third-party notices normally appear. The contents 116 | of the NOTICE file are for informational purposes only and 117 | do not modify the License. You may add Your own attribution 118 | notices within Derivative Works that You distribute, alongside 119 | or as an addendum to the NOTICE text from the Work, provided 120 | that such additional attribution notices cannot be construed 121 | as modifying the License. 122 | 123 | You may add Your own copyright statement to Your modifications and 124 | may provide additional or different license terms and conditions 125 | for use, reproduction, or distribution of Your modifications, or 126 | for any such Derivative Works as a whole, provided Your use, 127 | reproduction, and distribution of the Work otherwise complies with 128 | the conditions stated in this License. 129 | 130 | 5. Submission of Contributions. Unless You explicitly state otherwise, 131 | any Contribution intentionally submitted for inclusion in the Work 132 | by You to the Licensor shall be under the terms and conditions of 133 | this License, without any additional terms or conditions. 134 | Notwithstanding the above, nothing herein shall supersede or modify 135 | the terms of any separate license agreement you may have executed 136 | with Licensor regarding such Contributions. 137 | 138 | 6. Trademarks. This License does not grant permission to use the trade 139 | names, trademarks, service marks, or product names of the Licensor, 140 | except as required for reasonable and customary use in describing the 141 | origin of the Work and reproducing the content of the NOTICE file. 142 | 143 | 7. Disclaimer of Warranty. Unless required by applicable law or 144 | agreed to in writing, Licensor provides the Work (and each 145 | Contributor provides its Contributions) on an "AS IS" BASIS, 146 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 147 | implied, including, without limitation, any warranties or conditions 148 | of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A 149 | PARTICULAR PURPOSE. You are solely responsible for determining the 150 | appropriateness of using or redistributing the Work and assume any 151 | risks associated with Your exercise of permissions under this License. 152 | 153 | 8. Limitation of Liability. In no event and under no legal theory, 154 | whether in tort (including negligence), contract, or otherwise, 155 | unless required by applicable law (such as deliberate and grossly 156 | negligent acts) or agreed to in writing, shall any Contributor be 157 | liable to You for damages, including any direct, indirect, special, 158 | incidental, or consequential damages of any character arising as a 159 | result of this License or out of the use or inability to use the 160 | Work (including but not limited to damages for loss of goodwill, 161 | work stoppage, computer failure or malfunction, or any and all 162 | other commercial damages or losses), even if such Contributor 163 | has been advised of the possibility of such damages. 164 | 165 | 9. Accepting Warranty or Additional Liability. While redistributing 166 | the Work or Derivative Works thereof, You may choose to offer, 167 | and charge a fee for, acceptance of support, warranty, indemnity, 168 | or other liability obligations and/or rights consistent with this 169 | License. However, in accepting such obligations, You may act only 170 | on Your own behalf and on Your sole responsibility, not on behalf 171 | of any other Contributor, and only if You agree to indemnify, 172 | defend, and hold each Contributor harmless for any liability 173 | incurred by, or claims asserted against, such Contributor by reason 174 | of your accepting any such warranty or additional liability. 175 | 176 | END OF TERMS AND CONDITIONS 177 | 178 | APPENDIX: How to apply the Apache License to your work. 179 | 180 | To apply the Apache License to your work, attach the following 181 | boilerplate notice, with the fields enclosed by brackets "[]" 182 | replaced with your own identifying information. (Don't include 183 | the brackets!) The text should be enclosed in the appropriate 184 | comment syntax for the file format. We also recommend that a 185 | file or class name and description of purpose be included on the 186 | same "printed page" as the copyright notice for easier 187 | identification within third-party archives. 188 | 189 | Copyright 2020 Grey Shirts greyduchess@gmail.com 190 | 191 | Licensed under the Apache License, Version 2.0 (the "License"); 192 | you may not use this file except in compliance with the License. 193 | You may obtain a copy of the License at 194 | 195 | http://www.apache.org/licenses/LICENSE-2.0 196 | 197 | Unless required by applicable law or agreed to in writing, software 198 | distributed under the License is distributed on an "AS IS" BASIS, 199 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 200 | See the License for the specific language governing permissions and 201 | limitations under the License. 202 | -------------------------------------------------------------------------------- /app/src/main/java/app/videobookmarkuidemo/BookmarkListFragment.kt: -------------------------------------------------------------------------------- 1 | package app.thumbnailbookmark.ui 2 | 3 | import android.graphics.Rect 4 | import android.os.Bundle 5 | import android.view.* 6 | import androidx.fragment.app.Fragment 7 | import androidx.lifecycle.Observer 8 | import androidx.lifecycle.ViewModelProviders 9 | import androidx.recyclerview.widget.LinearLayoutManager 10 | import androidx.recyclerview.widget.RecyclerView 11 | import app.videobookmarkuidemo.MainActivityViewModel 12 | import app.videobookmarkuidemo.BookmarkListFragmentViewModel 13 | import app.videobookmarkuidemo.db.Bookmark 14 | import app.videobookmarkuidemo.R 15 | import app.videobookmarkuidemo.databinding.BookmarkBinding 16 | import app.videobookmarkuidemo.databinding.FolderBinding 17 | import app.videobookmarkuidemo.databinding.FragmentBookmarkListBinding 18 | import java.io.Serializable 19 | 20 | class BookmarkListFragment : Fragment() { 21 | 22 | class Arg(val folderId: Int) : Serializable 23 | 24 | companion object { 25 | fun newInstance(folderId: Int): BookmarkListFragment { 26 | val f = BookmarkListFragment().also { 27 | it.arguments = Bundle().also { it.putSerializable("arg", Arg(folderId = folderId)) } 28 | } 29 | return f 30 | } 31 | } 32 | 33 | lateinit var folderAdapter: BookmarkListAdapter 34 | lateinit var viewModel: BookmarkListFragmentViewModel 35 | lateinit var mainActivityViewModel: MainActivityViewModel 36 | 37 | fun getArg(): Arg { 38 | return requireArguments().getSerializable("arg") as Arg 39 | } 40 | 41 | override fun onCreate(savedInstanceState: Bundle?) { 42 | super.onCreate(savedInstanceState) 43 | 44 | folderAdapter = BookmarkListAdapter() 45 | folderAdapter.setHasStableIds(true) 46 | 47 | setHasOptionsMenu(true) 48 | 49 | } 50 | 51 | override fun onCreateView( 52 | inflater: LayoutInflater, 53 | container: ViewGroup?, 54 | savedInstanceState: Bundle? 55 | ): View? { 56 | 57 | val binding = FragmentBookmarkListBinding.inflate(inflater, container, false) 58 | binding.recyclerView.let { 59 | it.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false) 60 | it.adapter = folderAdapter 61 | it.addItemDecoration(BookmarkItemDecorator(resources.getDimensionPixelSize(R.dimen.movehere_height_half))) 62 | } 63 | 64 | return binding.root 65 | } 66 | 67 | override fun onViewCreated(view: View, savedInstanceState: Bundle?) { 68 | viewModel = ViewModelProviders.of(this).get(BookmarkListFragmentViewModel::class.java) 69 | viewModel.startLoading(getArg().folderId) 70 | 71 | mainActivityViewModel = 72 | ViewModelProviders.of(requireActivity()).get(MainActivityViewModel::class.java) 73 | mainActivityViewModel.selectedBookmarkNum.observe(viewLifecycleOwner, Observer { 74 | folderAdapter.notifyDataSetChanged() 75 | }) 76 | 77 | viewModel.bookmarkListLiveData.observe(viewLifecycleOwner, Observer { bookmarks -> 78 | folderAdapter.setData(bookmarks) 79 | }) 80 | viewModel.folderInfoLiveData.observe(viewLifecycleOwner, Observer { bookmark -> 81 | mainActivityViewModel.setCurrentFolder(bookmark) 82 | }) 83 | } 84 | 85 | inner class BookmarkListAdapter() : 86 | 87 | RecyclerView.Adapter() { 88 | 89 | val TYPE_FOLDER: Int = 0 90 | val TYPE_BOOKMARK: Int = 1 91 | val TYPE_BOTTOM_PADDING: Int = 2 92 | 93 | var bookmarks: List? = null 94 | 95 | override fun onCreateViewHolder( 96 | parent: ViewGroup, 97 | viewType: Int 98 | ): BookmarkListAdapterViewHolder { 99 | when (viewType) { 100 | TYPE_FOLDER -> { 101 | val binding = FolderBinding.inflate( 102 | LayoutInflater.from(parent.context), 103 | parent, 104 | false 105 | ) 106 | return BookmarkListAdapterFolderViewHolder(binding) 107 | } 108 | TYPE_BOOKMARK -> { 109 | val binding = BookmarkBinding.inflate( 110 | LayoutInflater.from(parent.context), 111 | parent, 112 | false 113 | ) 114 | return BookmarkListAdapterUrlViewHolder(binding) 115 | } 116 | TYPE_BOTTOM_PADDING -> { 117 | val view = LayoutInflater.from(parent.context) 118 | .inflate(R.layout.bottom_padding, parent, false) 119 | return BookmarkListAdapterBottomPaddingViewHolder(view) 120 | } 121 | else -> throw RuntimeException("unknown type") 122 | } 123 | } 124 | 125 | override fun getItemViewType(position: Int): Int { 126 | if (position >= bookmarks?.size ?: 0) { 127 | return TYPE_BOTTOM_PADDING 128 | } 129 | var idx = position 130 | if (bookmarks!!.get(idx).isFolder) { 131 | return TYPE_FOLDER 132 | } else { 133 | return TYPE_BOOKMARK 134 | } 135 | } 136 | 137 | fun getBookmarkIdx(position: Int): Int { 138 | var idx = position 139 | return idx 140 | } 141 | 142 | fun setData(bookmarks: List) { 143 | this.bookmarks = bookmarks 144 | notifyDataSetChanged() 145 | } 146 | 147 | override fun getItemCount(): Int { 148 | return (bookmarks?.size ?: 0) + 1 149 | } 150 | 151 | override fun getItemId(position: Int): Long { 152 | when (getItemViewType(position)) { 153 | TYPE_BOTTOM_PADDING -> { 154 | return 0 // autoincrementのIDと重ならないID 155 | } 156 | else -> { 157 | return bookmarks!!.get(getBookmarkIdx(position)).id.toLong() 158 | } 159 | } 160 | } 161 | 162 | override fun onBindViewHolder(holder: BookmarkListAdapterViewHolder, position: Int) { 163 | 164 | val isSelectionMode = mainActivityViewModel.isInSelectionMode() 165 | 166 | when (holder) { 167 | is BookmarkListAdapterFolderViewHolder -> { 168 | val idx = getBookmarkIdx(position) 169 | val bookmark = bookmarks!!.get(idx) 170 | val isSelected = mainActivityViewModel.isSelected(bookmark) 171 | 172 | val binding = holder.binding 173 | 174 | binding.foreground.setOnClickListener { onShortClick(bookmark, idx) } 175 | binding.foreground.setOnLongClickListener { onLongClick(bookmark, idx); true } 176 | if (isSelected) { 177 | binding.foreground.setBackgroundResource(R.drawable.bookmark_background_selected) 178 | } else { 179 | binding.foreground.setBackgroundResource(R.drawable.bookmark_background_notselected) 180 | } 181 | binding.text.text = bookmark.title 182 | binding.insert.insert.visibility = 183 | if (isSelectionMode) View.VISIBLE else View.INVISIBLE 184 | binding.insert.insert.setOnClickListener { onMoveHereClicked(position); } 185 | } 186 | is BookmarkListAdapterUrlViewHolder -> { 187 | val idx = getBookmarkIdx(position) 188 | val bookmark = bookmarks!!.get(idx) 189 | val isSelected = mainActivityViewModel.isSelected(bookmark) 190 | 191 | val binding = holder.binding 192 | 193 | binding.foreground.setOnClickListener { onShortClick(bookmark, idx) } 194 | binding.foreground.setOnLongClickListener { onLongClick(bookmark, idx); true } 195 | if (isSelected) { 196 | binding.foreground.setBackgroundResource(R.drawable.bookmark_background_selected) 197 | } else { 198 | binding.foreground.setBackgroundResource(R.drawable.bookmark_background_notselected) 199 | } 200 | binding.text.text = bookmark.title 201 | 202 | binding.insert.insert.visibility = 203 | if (isSelectionMode) View.VISIBLE else View.INVISIBLE 204 | binding.insert.insert.setOnClickListener { onMoveHereClicked(position); } 205 | } 206 | is BookmarkListAdapterBottomPaddingViewHolder -> { 207 | holder.moveHereButton.visibility = 208 | if (isSelectionMode) View.VISIBLE else View.INVISIBLE 209 | holder.moveHereButton.setOnClickListener { onMoveHereClicked(position); } 210 | } 211 | } 212 | } 213 | 214 | private fun onShortClick(bookmark: Bookmark, position: Int) { 215 | if (bookmark.isFolder) { 216 | if (mainActivityViewModel.isSelected(bookmark)) { 217 | // selectされているフォルダの中には入れない。clickで選択解除 218 | mainActivityViewModel.toggleSelection(bookmark) 219 | //notifyItemChanged(position) 220 | } else { 221 | fragmentManager?.let { 222 | val f = BookmarkListFragment.newInstance(bookmark.id) 223 | it.beginTransaction().replace(R.id.fragment_container, f) 224 | .addToBackStack(null).commit() 225 | } 226 | 227 | } 228 | } else { 229 | if (mainActivityViewModel.isInSelectionMode()) { 230 | mainActivityViewModel.toggleSelection(bookmark) 231 | //notifyItemChanged(position) 232 | } else { 233 | mainActivityViewModel.toggleSelection(bookmark) 234 | //mainActivityViewModel.openExternalBrowser(bookmark.url) 235 | } 236 | } 237 | } 238 | 239 | private fun onLongClick(bookmark: Bookmark, position: Int) { 240 | mainActivityViewModel.toggleSelection(bookmark) 241 | } 242 | 243 | private fun onMoveHereClicked(position: Int) { 244 | // positionの上に挿入する。 245 | val low: Double 246 | val high: Double 247 | when { 248 | itemCount == 1 -> { 249 | // paddingしかなく、bookmarkやfolderが一つもない 250 | low = 0.0 251 | high = 1.0 252 | } 253 | position == itemCount - 1 -> { 254 | // 最後のpadding部をクリック 255 | low = bookmarks!!.get(position - 1).sortOrder 256 | high = low + 1 257 | } 258 | position == 0 -> { 259 | high = bookmarks!!.get(position).sortOrder 260 | low = high - 1 261 | } 262 | else -> { 263 | low = bookmarks!!.get(position - 1).sortOrder 264 | high = bookmarks!!.get(position).sortOrder 265 | } 266 | } 267 | mainActivityViewModel.moveSelected(getArg().folderId, low, high) 268 | } 269 | 270 | } 271 | 272 | } 273 | 274 | class BookmarkItemDecorator(val offset: Int): RecyclerView.ItemDecoration() { 275 | override fun getItemOffsets( 276 | outRect: Rect, 277 | view: View, 278 | parent: RecyclerView, 279 | state: RecyclerView.State 280 | ) { 281 | val position = parent.getChildAdapterPosition(view) 282 | if (position == 0) { 283 | outRect.set(0, 0, 0, 0) 284 | } else { 285 | outRect.set(0, -offset, 0, 0) 286 | } 287 | } 288 | } 289 | 290 | 291 | open class BookmarkListAdapterViewHolder(val root: View) : RecyclerView.ViewHolder(root) { 292 | } 293 | 294 | class BookmarkListAdapterFolderViewHolder(val binding: FolderBinding) : 295 | BookmarkListAdapterViewHolder(binding.root) 296 | 297 | class BookmarkListAdapterUrlViewHolder(val binding: BookmarkBinding) : 298 | BookmarkListAdapterViewHolder(binding.root) 299 | 300 | class BookmarkListAdapterBottomPaddingViewHolder(root: View) : BookmarkListAdapterViewHolder(root) { 301 | val moveHereButton = root.findViewById(R.id.insert) 302 | } 303 | 304 | --------------------------------------------------------------------------------