Skip to content

Commit

Permalink
update AboutFragment, add privacy policy, cleanup
Browse files Browse the repository at this point in the history
WirelessAlien committed Dec 23, 2024
1 parent 7c7040a commit ef8dfab
Showing 22 changed files with 253 additions and 265 deletions.
34 changes: 25 additions & 9 deletions app/src/main/java/com/wirelessalien/zipxtract/AboutFragment.kt
Original file line number Diff line number Diff line change
@@ -21,29 +21,45 @@ import android.app.Dialog
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.Window
import androidx.fragment.app.DialogFragment
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.wirelessalien.zipxtract.databinding.FragmentAboutBinding


class AboutFragment : DialogFragment() {
private lateinit var binding: FragmentAboutBinding
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View {
binding = FragmentAboutBinding.inflate(inflater, container, false)
return binding.root
}

override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val binding = FragmentAboutBinding.inflate(layoutInflater)
val dialogView = binding.root
val dialog = super.onCreateDialog(savedInstanceState)
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
return dialog
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

binding.versionNumberText.text = BuildConfig.VERSION_NAME

binding.githubIcon.setOnClickListener {
binding.sourceCode.setOnClickListener {
openUrl("https://github.com/WirelessAlien/ZipXtract")
}

binding.githubIssueButton.setOnClickListener {
binding.reportIssue.setOnClickListener {
openUrl("https://github.com/WirelessAlien/ZipXtract/issues")
}

binding.licenseText.setOnClickListener {
openUrl("https://www.apache.org/licenses/LICENSE-2.0.txt")
openUrl("https://www.gnu.org/licenses/gpl-3.0.txt")
}

binding.donate.setOnClickListener {
@@ -61,9 +77,9 @@ class AboutFragment : DialogFragment() {
startActivity(Intent.createChooser(shareIntent, getString(R.string.share)))
}

return MaterialAlertDialogBuilder(requireContext())
.setView(dialogView)
.create()
binding.privacyPolicyLink.setOnClickListener {
openUrl("https://sites.google.com/view/privacy-policy-zipxtract/home")
}
}

private fun openUrl(url: String) {
Original file line number Diff line number Diff line change
@@ -18,15 +18,10 @@
package com.wirelessalien.zipxtract

import android.app.Dialog
import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.widget.Toast
import androidx.fragment.app.DialogFragment
import com.google.android.material.button.MaterialButton
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.wirelessalien.zipxtract.databinding.FragmentDonationBinding

@@ -48,7 +43,7 @@ class DonationFragment : DialogFragment() {
startActivity(intent)
}

return MaterialAlertDialogBuilder(requireContext())
return MaterialAlertDialogBuilder(requireContext(), R.style.MaterialDialog)
.setView(dView)
.create()
}
Original file line number Diff line number Diff line change
@@ -45,6 +45,7 @@ import androidx.core.content.FileProvider
import androidx.core.view.MenuHost
import androidx.core.view.MenuProvider
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentTransaction
import androidx.lifecycle.Lifecycle
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import androidx.recyclerview.widget.LinearLayoutManager
@@ -53,6 +54,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.progressindicator.LinearProgressIndicator
import com.google.android.material.snackbar.Snackbar
import com.google.android.material.textfield.TextInputEditText
import com.wirelessalien.zipxtract.AboutFragment
import com.wirelessalien.zipxtract.BuildConfig
import com.wirelessalien.zipxtract.R
import com.wirelessalien.zipxtract.adapter.FileAdapter
@@ -82,6 +84,7 @@ class ArchiveFragment : Fragment(), FileAdapter.OnItemClickListener {
SORT_BY_NAME, SORT_BY_SIZE, SORT_BY_MODIFIED, SORT_BY_EXTENSION
}
private var isSearchActive: Boolean = false
private var isLargeLayout: Boolean = false

private var sortBy: SortBy = SortBy.SORT_BY_NAME
private var sortAscending: Boolean = true
@@ -146,6 +149,7 @@ class ArchiveFragment : Fragment(), FileAdapter.OnItemClickListener {
sharedPreferences = requireActivity().getPreferences(Context.MODE_PRIVATE)
sortBy = SortBy.valueOf(sharedPreferences.getString("sortBy", SortBy.SORT_BY_NAME.name) ?: SortBy.SORT_BY_NAME.name)
sortAscending = sharedPreferences.getBoolean("sortAscending", true)
isLargeLayout = resources.getBoolean(R.bool.large_layout)

binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
adapter = FileAdapter(requireContext(), null, ArrayList())
@@ -207,6 +211,21 @@ class ArchiveFragment : Fragment(), FileAdapter.OnItemClickListener {
sortAscending = false
editor.putBoolean("sortAscending", sortAscending)
}
R.id.menu_about -> {
val fragmentManager = parentFragmentManager
val newFragment = AboutFragment()
if (isLargeLayout) {
// Show the fragment as a dialog.
newFragment.show(fragmentManager, "AboutFragment")
} else {
// Show the fragment fullscreen.
val transaction = fragmentManager.beginTransaction()
transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
transaction.add(android.R.id.content, newFragment)
.addToBackStack(null)
.commit()
}
}
}
editor.apply()
updateAdapterWithFullList()
Original file line number Diff line number Diff line change
@@ -65,6 +65,7 @@ import com.google.android.material.chip.Chip
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.progressindicator.LinearProgressIndicator
import com.google.android.material.textfield.TextInputEditText
import com.wirelessalien.zipxtract.AboutFragment
import com.wirelessalien.zipxtract.BuildConfig
import com.wirelessalien.zipxtract.R
import com.wirelessalien.zipxtract.adapter.FileAdapter
@@ -268,6 +269,21 @@ class MainFragment : Fragment(), FileAdapter.OnItemClickListener, FileAdapter.On
sortAscending = false
editor.putBoolean("sortAscending", sortAscending)
}
R.id.menu_about -> {
val fragmentManager = parentFragmentManager
val newFragment = AboutFragment()
if (isLargeLayout) {
// Show the fragment as a dialog.
newFragment.show(fragmentManager, "AboutFragment")
} else {
// Show the fragment fullscreen.
val transaction = fragmentManager.beginTransaction()
transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
transaction.add(android.R.id.content, newFragment)
.addToBackStack(null)
.commit()
}
}
}
editor.apply()
initRecyclerView()
56 changes: 56 additions & 0 deletions app/src/main/res/drawable/app_icon_m.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<!--
~ Copyright (C) 2023 WirelessAlien <https://github.com/WirelessAlien>
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="800dp"
android:height="800dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">>
<path
android:pathData="M3,14V10C3,6.229 3,4.343 4.172,3.172C5.343,2 7.229,2 11,2H13C16.771,2 18.657,2 19.828,3.172C20.482,3.825 20.771,4.7 20.899,6M21,10V14C21,17.771 21,19.657 19.828,20.828C18.657,22 16.771,22 13,22H11C7.229,22 5.343,22 4.172,20.828C3.518,20.175 3.229,19.3 3.101,18"
android:strokeWidth="1.6320000000000001"
android:fillColor="#00000000"
android:strokeColor="#1C274C"
android:strokeLineCap="round"/>
<path
android:pathData="M9.5,15.5V15.375C9.5,14.892 9.892,14.5 10.375,14.5H13.625C14.108,14.5 14.5,14.892 14.5,15.375V15.5C14.5,16.881 13.381,18 12,18C10.619,18 9.5,16.881 9.5,15.5Z"
android:strokeWidth="1.6320000000000001"
android:fillColor="#00000000"
android:strokeColor="#1C274C"
android:strokeLineCap="round"/>
<path
android:pathData="M9.5,3C9.5,2.529 9.5,2.293 9.646,2.146C9.793,2 10.029,2 10.5,2H11C11.471,2 11.707,2 11.854,2.146C12,2.293 12,2.529 12,3V3.5C12,3.971 12,4.207 11.854,4.354C11.707,4.5 11.471,4.5 11,4.5H10.5C10.029,4.5 9.793,4.5 9.646,4.354C9.5,4.207 9.5,3.971 9.5,3.5V3Z"
android:strokeWidth="1.6320000000000001"
android:fillColor="#00000000"
android:strokeColor="#1C274C"/>
<path
android:pathData="M9.5,8C9.5,7.529 9.5,7.293 9.646,7.146C9.793,7 10.029,7 10.5,7H11C11.471,7 11.707,7 11.854,7.146C12,7.293 12,7.529 12,8V8.5C12,8.971 12,9.207 11.854,9.354C11.707,9.5 11.471,9.5 11,9.5H10.5C10.029,9.5 9.793,9.5 9.646,9.354C9.5,9.207 9.5,8.971 9.5,8.5V8Z"
android:strokeWidth="1.6320000000000001"
android:fillColor="#00000000"
android:strokeColor="#1C274C"/>
<path
android:pathData="M12,5.5C12,5.029 12,4.793 12.146,4.646C12.293,4.5 12.529,4.5 13,4.5H13.5C13.971,4.5 14.207,4.5 14.354,4.646C14.5,4.793 14.5,5.029 14.5,5.5V6C14.5,6.471 14.5,6.707 14.354,6.854C14.207,7 13.971,7 13.5,7H13C12.529,7 12.293,7 12.146,6.854C12,6.707 12,6.471 12,6V5.5Z"
android:strokeWidth="1.6320000000000001"
android:fillColor="#00000000"
android:strokeColor="#1C274C"/>
<path
android:pathData="M12,10.5C12,10.029 12,9.793 12.146,9.646C12.293,9.5 12.529,9.5 13,9.5H13.5C13.971,9.5 14.207,9.5 14.354,9.646C14.5,9.793 14.5,10.029 14.5,10.5V11C14.5,11.471 14.5,11.707 14.354,11.854C14.207,12 13.971,12 13.5,12H13C12.529,12 12.293,12 12.146,11.854C12,11.707 12,11.471 12,11V10.5Z"
android:strokeWidth="1.6320000000000001"
android:fillColor="#00000000"
android:strokeColor="#1C274C"/>
</vector>
10 changes: 0 additions & 10 deletions app/src/main/res/drawable/ic_7z.xml

This file was deleted.

10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_archive.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M480,411.54Q467.23,411.54 458.62,420.15Q450,428.77 450,441.54L450,589.54L397.08,536.62Q388.77,528.31 376.19,528.12Q363.62,527.92 354.92,536.62Q346.23,545.31 346.23,557.69Q346.23,570.08 354.92,578.77L454.69,678.54Q465.54,689.38 480,689.38Q494.46,689.38 505.31,678.54L605.08,578.77Q613.38,570.46 613.58,557.88Q613.77,545.31 605.08,536.62Q596.38,527.92 584,527.92Q571.62,527.92 562.92,536.62L510,589.54L510,441.54Q510,428.77 501.38,420.15Q492.77,411.54 480,411.54ZM200,316.15L200,747.69Q200,753.08 203.46,756.54Q206.92,760 212.31,760L747.69,760Q753.08,760 756.54,756.54Q760,753.08 760,747.69L760,316.15L200,316.15ZM215.39,820Q185.46,820 162.73,797.27Q140,774.54 140,744.61L140,280.23Q140,267.39 144.12,255.73Q148.23,244.08 156.46,234.23L212.62,166.31Q222.46,153.46 237.23,146.73Q252,140 268.46,140L690.77,140Q707.23,140 722.19,146.73Q737.15,153.46 747,166.31L803.54,235Q811.77,244.85 815.88,256.69Q820,268.54 820,281.39L820,744.61Q820,774.54 797.27,797.27Q774.54,820 744.61,820L215.39,820ZM215.62,256.16L744,256.16L700.38,204.23Q698.46,202.31 695.96,201.15Q693.46,200 690.77,200L268.85,200Q266.16,200 263.65,201.15Q261.15,202.31 259.23,204.23L215.62,256.16ZM480,538.08L480,538.08L480,538.08Q480,538.08 480,538.08Q480,538.08 480,538.08L480,538.08Q480,538.08 480,538.08Q480,538.08 480,538.08Z"/>
</vector>
22 changes: 0 additions & 22 deletions app/src/main/res/drawable/ic_copy_all.xml

This file was deleted.

22 changes: 0 additions & 22 deletions app/src/main/res/drawable/ic_copy_file.xml

This file was deleted.

22 changes: 0 additions & 22 deletions app/src/main/res/drawable/ic_currency.xml

This file was deleted.

10 changes: 0 additions & 10 deletions app/src/main/res/drawable/ic_description.xml

This file was deleted.

22 changes: 0 additions & 22 deletions app/src/main/res/drawable/ic_files_copy.xml

This file was deleted.

22 changes: 0 additions & 22 deletions app/src/main/res/drawable/ic_folder_copy.xml

This file was deleted.

10 changes: 0 additions & 10 deletions app/src/main/res/drawable/ic_folder_zip.xml

This file was deleted.

10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_home.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M240,760L373.85,760L373.85,558.46Q373.85,543.1 384.24,532.7Q394.64,522.31 410,522.31L550,522.31Q565.36,522.31 575.76,532.7Q586.15,543.1 586.15,558.46L586.15,760L720,760L720,406.15Q720,403.08 718.65,400.58Q717.31,398.08 715,396.15L487.31,225Q484.23,222.31 480,222.31Q475.77,222.31 472.69,225L245,396.15Q242.69,398.08 241.35,400.58Q240,403.08 240,406.15L240,760ZM180,760L180,406.15Q180,388.98 187.68,373.62Q195.37,358.25 208.92,348.31L436.62,176.77Q455.57,162.31 479.94,162.31Q504.31,162.31 523.38,176.77L751.08,348.31Q764.63,358.25 772.32,373.62Q780,388.98 780,406.15L780,760Q780,784.54 762.27,802.27Q744.54,820 720,820L562.31,820Q546.94,820 536.55,809.6Q526.15,799.21 526.15,783.84L526.15,582.31Q526.15,582.31 526.15,582.31Q526.15,582.31 526.15,582.31L433.85,582.31Q433.85,582.31 433.85,582.31Q433.85,582.31 433.85,582.31L433.85,783.84Q433.85,799.21 423.45,809.6Q413.06,820 397.69,820L240,820Q215.46,820 197.73,802.27Q180,784.54 180,760ZM480,490.77L480,490.77L480,490.77Q480,490.77 480,490.77Q480,490.77 480,490.77L480,490.77L480,490.77L480,490.77L480,490.77Q480,490.77 480,490.77Q480,490.77 480,490.77L480,490.77Q480,490.77 480,490.77Q480,490.77 480,490.77L480,490.77Z"/>
</vector>
10 changes: 0 additions & 10 deletions app/src/main/res/drawable/ic_rar.xml

This file was deleted.

7 changes: 3 additions & 4 deletions app/src/main/res/drawable/ic_search.xml
Original file line number Diff line number Diff line change
@@ -3,9 +3,8 @@
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="?attr/colorControlNormal"
android:autoMirrored="true">
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M120,760Q103,760 91.5,748.5Q80,737 80,720Q80,703 91.5,691.5Q103,680 120,680L440,680Q457,680 468.5,691.5Q480,703 480,720Q480,737 468.5,748.5Q457,760 440,760L120,760ZM120,560Q103,560 91.5,548.5Q80,537 80,520Q80,503 91.5,491.5Q103,480 120,480L240,480Q257,480 268.5,491.5Q280,503 280,520Q280,537 268.5,548.5Q257,560 240,560L120,560ZM120,360Q103,360 91.5,348.5Q80,337 80,320Q80,303 91.5,291.5Q103,280 120,280L240,280Q257,280 268.5,291.5Q280,303 280,320Q280,337 268.5,348.5Q257,360 240,360L120,360ZM560,640Q477,640 418.5,581.5Q360,523 360,440Q360,357 418.5,298.5Q477,240 560,240Q643,240 701.5,298.5Q760,357 760,440Q760,469 751.5,497.5Q743,526 726,550L852,676Q863,687 863,704Q863,721 852,732Q841,743 824,743Q807,743 796,732L670,606Q646,623 617.5,631.5Q589,640 560,640ZM560,560Q610,560 645,525Q680,490 680,440Q680,390 645,355Q610,320 560,320Q510,320 475,355Q440,390 440,440Q440,490 475,525Q510,560 560,560Z"/>
android:fillColor="#FF000000"
android:pathData="M380,640q-109,0 -184.5,-75.5T120,380q0,-109 75.5,-184.5T380,120q109,0 184.5,75.5T640,380q0,44 -14,83t-38,69l224,224q11,11 11,28t-11,28q-11,11 -28,11t-28,-11L532,588q-30,24 -69,38t-83,14ZM380,560q75,0 127.5,-52.5T560,380q0,-75 -52.5,-127.5T380,200q-75,0 -127.5,52.5T200,380q0,75 52.5,127.5T380,560Z"/>
</vector>
141 changes: 74 additions & 67 deletions app/src/main/res/layout/fragment_about.xml
Original file line number Diff line number Diff line change
@@ -20,84 +20,91 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="15dp"
android:background="@color/md_theme_surface"
android:padding="16dp"
android:gravity="center">

<ImageView
android:id="@+id/appIcon"
android:layout_width="80dp"
android:layout_height="80dp"
android:contentDescription="@string/app_name"
android:src="@mipmap/ic_launcher_foreground" />
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:src="@drawable/app_icon_m" />

<RelativeLayout
android:layout_width="match_parent"
<TextView
android:id="@+id/app_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/app_name"
android:textSize="18sp"
android:textStyle="bold"
android:paddingTop="8dp" />

<TextView
android:id="@+id/versionNumberText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Version 1.0"
android:paddingTop="4dp" />

<TextView
android:id="@+id/source_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/source_code"
android:textColor="?attr/colorPrimary"
android:paddingTop="16dp" />

<TextView
android:id="@+id/licenseText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal">
android:text="@string/license"
android:textColor="?attr/colorPrimary"
android:paddingTop="8dp" />

<TextView
android:id="@+id/version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/version"
android:textSize="18sp"
android:gravity="center"/>
<TextView
android:id="@+id/versionNumberText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/version"
android:layout_marginStart="2dp"
android:text="Version 3.0"
android:textSize="18sp"
android:gravity="center"/>
</RelativeLayout>
<RelativeLayout
<TextView
android:id="@+id/app_author"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/author_wirelessalien"
android:paddingTop="8dp" />

<TextView
android:id="@+id/report_issue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/report_an_issue"
android:textColor="?attr/colorPrimary"
android:paddingTop="8dp" />

<com.google.android.material.button.MaterialButton
android:id="@+id/donate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/githubIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?attr/materialIconButtonStyle"
app:icon="@drawable/ic_github"
android:layout_alignParentStart="true"
android:contentDescription="@string/github_icon" />
android:text="@string/donate"
app:cornerRadius="5dp"
style="@style/Widget.Material3.Button.TonalButton"
android:layout_marginTop="20dp" />

<com.google.android.material.button.MaterialButton
android:id="@+id/githubIssueButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/ic_bug_report"
android:layout_toEndOf="@id/githubIcon"
style="?attr/materialIconButtonStyle" />
<com.google.android.material.button.MaterialButton
android:id="@+id/shareIcon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/share"
app:cornerRadius="5dp"
style="@style/Widget.Material3.Button.TonalButton"
android:layout_marginTop="20dp" />

<com.google.android.material.button.MaterialButton
android:id="@+id/licenseText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?attr/materialIconButtonStyle"
android:layout_toEndOf="@id/githubIssueButton"
app:icon="@drawable/ic_copyright"
android:textSize="16sp" />
<TextView
android:id="@+id/privacyPolicyLink"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/privacy_policy"
android:textColor="?attr/colorPrimary"
android:paddingTop="16dp" />

<com.google.android.material.button.MaterialButton
android:id="@+id/donate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?attr/materialIconButtonStyle"
android:layout_toEndOf="@id/licenseText"
app:icon="@drawable/ic_currency"
android:textSize="16sp" />

<com.google.android.material.button.MaterialButton
android:id="@+id/shareIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?attr/materialIconButtonStyle"
app:icon="@drawable/ic_share"
android:layout_toEndOf="@id/donate"
android:contentDescription="@string/share_icon" />
</RelativeLayout>
</LinearLayout>
52 changes: 25 additions & 27 deletions app/src/main/res/layout/fragment_donation.xml
Original file line number Diff line number Diff line change
@@ -17,39 +17,37 @@
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/parentLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="10dp">
<LinearLayout
android:padding="16dp">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="5dp">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="25sp"
android:text="@string/donate"/>
android:textSize="18sp"
android:text="@string/donate"/>

<com.google.android.material.button.MaterialButton
android:id="@+id/libPayBtn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_liberapay"
app:cornerRadius="10dp"
android:text="@string/liberapay" />
<com.google.android.material.button.MaterialButton
android:id="@+id/libPayBtn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_liberapay"
android:layout_marginTop="10dp"
style="@style/Widget.Material3.Button.TonalButton"
app:cornerRadius="5dp"
android:text="@string/liberapay" />

<com.google.android.material.button.MaterialButton
android:id="@+id/githubSBtn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_github"
app:cornerRadius="10dp"
android:text="Github Sponsor" />
</LinearLayout>
</RelativeLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/githubSBtn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_github"
android:layout_marginTop="10dp"
style="@style/Widget.Material3.Button.TonalButton"
app:cornerRadius="5dp"
android:text="Github Sponsor" />
</LinearLayout>
4 changes: 2 additions & 2 deletions app/src/main/res/menu/bottom_nav.xml
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@

<item
android:id="@+id/home"
android:icon="@drawable/ic_extract_z"
android:icon="@drawable/ic_home"
android:title="@string/home" />

<item
android:id="@+id/archive"
android:icon="@drawable/ic_create_z"
android:icon="@drawable/ic_archive"
android:title="@string/archive" />
</menu>
6 changes: 6 additions & 0 deletions app/src/main/res/menu/menu_main.xml
Original file line number Diff line number Diff line change
@@ -40,5 +40,11 @@
android:title="@string/descending" />
</menu>
</item>

<item
android:id="@+id/menu_about"
android:icon="@drawable/ic_info"
android:title="@string/about"
app:showAsAction="ifRoom" />
</menu>

6 changes: 6 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -132,4 +132,10 @@
<string name="extracting_progress">Extracting… %1$d %%</string>
<string name="compressing_progress">Compressing… %1$d %%</string>
<string name="home">Home</string>
<string name="privacy_policy">Privacy Policy</string>
<string name="source_code">Source Code</string>
<string name="license">License</string>
<string name="author_wirelessalien">Author: WirelessAlien</string>
<string name="report_an_issue">Report an Issue</string>
<string name="about">About</string>
</resources>

0 comments on commit ef8dfab

Please sign in to comment.