Skip to content

Commit

Permalink
Add landscape album view
Browse files Browse the repository at this point in the history
  • Loading branch information
tretdm committed Apr 15, 2024
1 parent b0a6202 commit 3187f0a
Show file tree
Hide file tree
Showing 5 changed files with 154 additions and 33 deletions.
18 changes: 0 additions & 18 deletions app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
<facet type="native-android-gradle" name="Native-Android-Gradle">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="fdroidConfigDebug" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/build/intermediates/classes/prereleaseConfig/debug" />
Expand All @@ -44,7 +39,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfigDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfigDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfigDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfigDebug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfigDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfigDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/prereleaseConfig/debug" isTestSource="true" generated="true" />
Expand All @@ -59,71 +53,62 @@
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfigDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfigDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfigDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfigDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfigDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfigDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfig/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfig/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfig/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfig/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfig/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfig/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfig/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/prereleaseConfig/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfig/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfig/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfig/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfig/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfig/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfig/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfig/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPrereleaseConfig/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPrereleaseConfig/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPrereleaseConfig/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPrereleaseConfig/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPrereleaseConfig/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPrereleaseConfig/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPrereleaseConfig/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPrereleaseConfig/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestPrereleaseConfig/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
Expand All @@ -143,9 +128,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<content url="file://$MODULE_DIR$/../ndk-modules/ovkmplayer">
<sourceFolder url="file://$MODULE_DIR$/../ndk-modules/ovkmplayer" isTestSource="false" />
</content>
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="Gradle: com.reginald.swiperefresh:library-1.1.2" level="project" />
Expand Down
17 changes: 8 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
apply plugin: 'com.android.application'
import org.apache.tools.ant.taskdefs.condition.Os

def getGitHubCommit = {
try {
Expand Down Expand Up @@ -80,8 +79,8 @@ android {
minSdkVersion 7
//noinspection GradleDependency,OldTargetApi
targetSdkVersion 29
versionCode 239
versionName "1.2.239-u"
versionCode 240
versionName "1.2.240-u"
}
buildTypes {
release {
Expand All @@ -100,16 +99,16 @@ android {
minSdkVersion 7
//noinspection OldTargetApi
targetSdkVersion 29
versionCode 239
versionName "1.2.239-d"
versionCode 240
versionName "1.2.240-d"
signingConfig signingConfigs.debug
}
releaseConfig {
minSdkVersion 7
applicationId 'uk.openvk.android.legacy'
targetSdkVersion 29
versionCode 239
versionName '1.2.239'
versionCode 240
versionName '1.2.240'
if (file('.signing/app-release.prop').exists()) {
signingConfig signingConfigs.release
}
Expand All @@ -120,8 +119,8 @@ android {
minSdkVersion 7
//noinspection OldTargetApi
targetSdkVersion 29
versionCode 239
versionName "1.2.239-f"
versionCode 240
versionName "1.2.240-f"
if (file('.signing/app-fdroid.prop').exists()) {
signingConfig signingConfigs.fdroid
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ public boolean onCreateOptionsMenu(Menu menu)
@SuppressLint("NewApi")
@Override
protected void setTranslucentStatusBar() {
resetTranslucentStatusBar();
//resetTranslucentStatusBar();
if(Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT)
super.setLegacyTranslucentStatusBar(1, Color.parseColor("#D8000000"));
else if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
Expand All @@ -424,7 +424,7 @@ else if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {

protected void enableFullScreenMode() {
if (!isFullScreenMode) {
resetTranslucentStatusBar();
//resetTranslucentStatusBar();
getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
getWindow().getDecorView().setSystemUiVisibility(
Expand All @@ -447,8 +447,8 @@ protected void enableFullScreenMode() {
isFullScreenMode = !isFullScreenMode;
}

@Override
protected void resetTranslucentStatusBar() {
super.resetTranslucentStatusBar();
}
// @Override
// protected void resetTranslucentStatusBar() {
// super.resetTranslucentStatusBar();
// }
}
70 changes: 70 additions & 0 deletions app/src/main/res/layout-land/activity_photo_album.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_black_v2"
android:orientation="horizontal">

<uk.openvk.android.legacy.ui.views.ProgressLayout
android:id="@+id/progress_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">

</uk.openvk.android.legacy.ui.views.ProgressLayout>

<FrameLayout
android:id="@+id/album_header"
android:layout_width="200dp"
android:layout_height="match_parent">

<ImageView
android:id="@+id/album_thumb"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/photo_loading_black" />

<LinearLayout
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:background="@drawable/widget_player_gradient"
android:orientation="vertical"
android:padding="10dip">

<TextView
android:id="@+id/album_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="marquee"
android:fontFamily="sans-serif-light"
android:singleLine="true"
android:text="Album title"
android:textColor="#FFF"
android:textSize="24sp" />

<TextView
android:id="@+id/album_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="410 photos"
android:textColor="#BFffffff" />

</LinearLayout>
</FrameLayout>

<android.support.v7.widget.RecyclerView
android:id="@+id/photos_listview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1" >

</android.support.v7.widget.RecyclerView>

</LinearLayout>
70 changes: 70 additions & 0 deletions app/src/main/res/layout-sw600dp-land/activity_photo_album.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_black_v2"
android:orientation="horizontal">

<uk.openvk.android.legacy.ui.views.ProgressLayout
android:id="@+id/progress_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">

</uk.openvk.android.legacy.ui.views.ProgressLayout>

<FrameLayout
android:id="@+id/album_header"
android:layout_width="384dp"
android:layout_height="match_parent">

<ImageView
android:id="@+id/album_thumb"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/photo_loading_black" />

<LinearLayout
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:background="@drawable/widget_player_gradient"
android:orientation="vertical"
android:padding="10dip">

<TextView
android:id="@+id/album_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="marquee"
android:fontFamily="sans-serif-light"
android:singleLine="true"
android:text="Album title"
android:textColor="#FFF"
android:textSize="24sp" />

<TextView
android:id="@+id/album_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="410 photos"
android:textColor="#BFffffff" />

</LinearLayout>
</FrameLayout>

<android.support.v7.widget.RecyclerView
android:id="@+id/photos_listview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1" >

</android.support.v7.widget.RecyclerView>

</LinearLayout>

0 comments on commit 3187f0a

Please sign in to comment.