Skip to content

AOO-25: Enabled Internet Archive #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 25, 2024
Merged

AOO-25: Enabled Internet Archive #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88e2cab
AOO-25: Enabled Internet Archive
Elelan Nov 25, 2024
972f959
AOO-25: Enabled Internet Archive
Elelan Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@ android {
}

signingConfigs {
debug {
def props = new Properties()
def localPropsFile = rootProject.file('local.properties')
if (localPropsFile.exists()) {
localPropsFile.withInputStream { props.load(it) }
}

storeFile = file(props['storeFile'] ?: "")
storePassword = props['storePassword'] ?: ""
keyAlias = props['keyAlias'] ?: ""
keyPassword = props['keyPassword'] ?: ""
}
}

compileSdk 34
Expand All @@ -17,7 +29,7 @@ android {
minSdkVersion 29
//noinspection OldTargetApi
targetSdkVersion 34
versionCode 30001
versionCode 30004
versionName "0.7.4"
archivesBaseName = "Save-$versionName"
multiDexEnabled true
Expand All @@ -28,9 +40,15 @@ android {
flavorDimensions += "free"
buildTypes {
release {
signingConfig signingConfigs.debug
minifyEnabled false
shrinkResources false
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}

debug {
signingConfig signingConfigs.debug
}
}
packagingOptions {
resources {
Expand Down
20 changes: 10 additions & 10 deletions app/src/main/java/net/opendasharchive/openarchive/features/settings/SpaceSetupFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ class SpaceSetupFragment : Fragment() {
setFragmentResult(RESULT_REQUEST_KEY, bundleOf(RESULT_BUNDLE_KEY to RESULT_VAL_WEBDAV))
}

// if (Space.has(Space.Type.INTERNET_ARCHIVE)) {
// mBinding.internetArchive.hide()
// } else {
// mBinding.internetArchive.setOnClickListener {
// setFragmentResult(
// RESULT_REQUEST_KEY,
// bundleOf(RESULT_BUNDLE_KEY to RESULT_VAL_INTERNET_ARCHIVE)
// )
// }
// }
if (Space.has(Space.Type.INTERNET_ARCHIVE)) {
mBinding.internetArchive.hide()
} else {
mBinding.internetArchive.setOnClickListener {
setFragmentResult(
RESULT_REQUEST_KEY,
bundleOf(RESULT_BUNDLE_KEY to RESULT_VAL_INTERNET_ARCHIVE)
)
}
}

// if (Space.has(Space.Type.GDRIVE) || !playServicesAvailable()) {
// mBinding.gdrive.hide()
Expand Down
130 changes: 65 additions & 65 deletions app/src/main/res/layout/fragment_space_setup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,80 +108,80 @@

</com.google.android.material.card.MaterialCardView>

<!-- <com.google.android.material.card.MaterialCardView-->
<!-- android:id="@+id/internet_archive"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="120dp"-->
<!-- android:layout_marginHorizontal="@dimen/activity_horizontal_margin"-->
<!-- android:layout_marginVertical="@dimen/activity_vertical_margin"-->
<!-- android:background="?attr/selectableItemBackground"-->
<!-- android:clickable="true"-->
<!-- android:focusable="true"-->
<!-- app:cardBackgroundColor="@color/colorBackground"-->
<!-- app:cardCornerRadius="@dimen/activity_horizontal_margin"-->
<!-- app:cardElevation="0dp"-->
<!-- app:strokeColor="@color/colorOnBackground"-->
<!-- app:strokeWidth="@dimen/border_width">-->
<com.google.android.material.card.MaterialCardView
android:id="@+id/internet_archive"
android:layout_width="match_parent"
android:layout_height="120dp"
android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
android:layout_marginVertical="@dimen/activity_vertical_margin"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
app:cardBackgroundColor="@color/colorBackground"
app:cardCornerRadius="@dimen/activity_horizontal_margin"
app:cardElevation="0dp"
app:strokeColor="@color/colorOnBackground"
app:strokeWidth="@dimen/border_width">

<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="center_vertical"-->
<!-- android:layout_marginHorizontal="@dimen/activity_horizontal_margin"-->
<!-- android:orientation="horizontal">-->
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
android:orientation="horizontal">

<!-- <ImageView-->
<!-- android:id="@+id/icon_internet_archive"-->
<!-- android:layout_width="32dp"-->
<!-- android:layout_height="32dp"-->
<!-- android:importantForAccessibility="no"-->
<!-- android:padding="2dp"-->
<!-- android:src="@drawable/ic_internet_archive"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<ImageView
android:id="@+id/icon_internet_archive"
android:layout_width="32dp"
android:layout_height="32dp"
android:importantForAccessibility="no"
android:padding="2dp"
android:src="@drawable/ic_internet_archive"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<!-- <LinearLayout-->
<!-- android:id="@+id/internet_archive_texts"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical"-->
<!-- android:paddingStart="8dp"-->
<!-- android:paddingEnd="8dp"-->
<!-- app:layout_constraintEnd_toStartOf="@id/icon_next_internet_archive"-->
<!-- app:layout_constraintStart_toEndOf="@id/icon_internet_archive"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<LinearLayout
android:id="@+id/internet_archive_texts"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="8dp"
android:paddingEnd="8dp"
app:layout_constraintEnd_toStartOf="@id/icon_next_internet_archive"
app:layout_constraintStart_toEndOf="@id/icon_internet_archive"
app:layout_constraintTop_toTopOf="parent">

<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/internet_archive"-->
<!-- android:textSize="20sp"-->
<!-- android:textStyle="bold" />-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/internet_archive"
android:textSize="20sp"
android:textStyle="bold" />

<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/upload_to_the_internet_archive"-->
<!-- android:textSize="14sp" />-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/upload_to_the_internet_archive"
android:textSize="14sp" />

<!-- </LinearLayout>-->
</LinearLayout>

<!-- <ImageView-->
<!-- android:id="@+id/icon_next_internet_archive"-->
<!-- android:layout_width="18dp"-->
<!-- android:layout_height="18dp"-->
<!-- android:src="@drawable/onboarding23_arrow_right"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toEndOf="@id/internet_archive_texts"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:tint="@color/colorSpaceSetupProgressOn"-->
<!-- android:importantForAccessibility="no" />-->
<ImageView
android:id="@+id/icon_next_internet_archive"
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/onboarding23_arrow_right"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/internet_archive_texts"
app:layout_constraintTop_toTopOf="parent"
app:tint="@color/colorSpaceSetupProgressOn"
android:importantForAccessibility="no" />

<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
</androidx.constraintlayout.widget.ConstraintLayout>

<!-- </com.google.android.material.card.MaterialCardView>-->
</com.google.android.material.card.MaterialCardView>

<!-- <com.google.android.material.card.MaterialCardView-->
<!-- android:id="@+id/gdrive"-->
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<!-- FirstStartActivity -->
<string name="internet_archive">Internet Archive</string>
<string name="internet_archive_description">Upload your media to a public server.</string>
<string name="internet_archive_description">Upload your media to a free public or paid private account on the Internet Archive.</string>
<string name="gdrive" translatable="false">Google Drive</string>
<string name="gdrive_tm" translatable="false">Google Drive™</string>
<string name="upload_to_gdrive">Upload to Google Drive</string>
Expand Down Expand Up @@ -300,7 +300,7 @@
<string name="label_email">Email</string>
<string name="label_screen_name">Screen Name</string>
<string name="label_login">Login</string>
<string name="label_create_login">Sign up</string>
<string name="label_create_login">Create one</string>
<string name="prompt_no_account">No account?</string>
<string name="action_continue">Continue</string>

Expand Down