kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 22:30:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #659 from Bnyro/master

Browse Source 
UI improvements and settings crash fixed
This commit is contained in:
Bnyro 2022-07-01 21:33:25 +02:00 committed by GitHub
commit 1bd9e43c85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 122 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -27,7 +27,7 @@
android:exported="false" />
<activity
android:name=".activities.NoInternetActivity"
android:label="@string/noInternet"/>
android:label="@string/noInternet" />
<activity
android:name=".activities.SettingsActivity"
android:label="@string/settings" />

3
app/src/main/java/com/github/libretube/activities/MainActivity.kt
View File

@ -79,7 +79,8 @@ class MainActivity : AppCompatActivity() {
// hide the trending page if enabled
val hideTrendingPage = PreferenceHelper.getBoolean(this, "hide_trending_page", false)
if (hideTrendingPage) bottomNavigationView.menu.findItem(R.id.homeFragment).isVisible = false
if (hideTrendingPage) bottomNavigationView.menu.findItem(R.id.homeFragment).isVisible =
false
// navigate to the default start tab
when (PreferenceHelper.getString(this, "default_tab", "home")) {

5
app/src/main/java/com/github/libretube/dialogs/CustomInstanceDialog.kt
View File

@ -1,12 +1,14 @@
package com.github.libretube.dialogs
import android.app.Dialog
import android.content.Intent
import android.os.Bundle
import android.util.TypedValue
import android.widget.Toast
import androidx.core.text.HtmlCompat
import androidx.fragment.app.DialogFragment
import com.github.libretube.R
import com.github.libretube.activities.SettingsActivity
import com.github.libretube.databinding.DialogCustomInstanceBinding
import com.github.libretube.obj.CustomInstance
import com.github.libretube.util.PreferenceHelper
@ -43,7 +45,8 @@ class CustomInstanceDialog : DialogFragment() {
URL(customInstance.frontendUrl).toURI()
PreferenceHelper.saveCustomInstance(requireContext(), customInstance)
activity?.recreate()
val intent = Intent(context, SettingsActivity::class.java)
startActivity(intent)
dismiss()
} catch (e: Exception) {
// invalid URL

3
app/src/main/java/com/github/libretube/fragments/LibraryFragment.kt
View File

@ -46,7 +46,8 @@ class LibraryFragment : Fragment() {
token = PreferenceHelper.getToken(requireContext())
// hide watch history button of history disabled
val watchHistoryEnabled = PreferenceHelper.getBoolean(requireContext(), "watch_history_toggle", true)
val watchHistoryEnabled =
PreferenceHelper.getBoolean(requireContext(), "watch_history_toggle", true)
if (!watchHistoryEnabled) {
binding.showWatchHistory.visibility = View.GONE
} else {

5
app/src/main/java/com/github/libretube/preferences/AdvancedSettings.kt
View File

@ -1,6 +1,8 @@
package com.github.libretube.preferences
import android.content.Intent
import android.os.Bundle
import androidx.navigation.fragment.findNavController
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import com.github.libretube.R
@ -49,7 +51,8 @@ class AdvancedSettings : PreferenceFragmentCompat() {
PreferenceHelper.setToken(requireContext(), "")
requireMainActivityRestart = true
activity?.recreate()
val intent = Intent(context, SettingsActivity::class.java)
startActivity(intent)
}
.setNegativeButton(getString(R.string.cancel)) { _, _ -> }
.setTitle(R.string.reset)

5
app/src/main/java/com/github/libretube/preferences/AppearanceSettings.kt
View File

@ -1,6 +1,8 @@
package com.github.libretube.preferences
import android.content.Intent
import android.os.Bundle
import android.util.Log
import androidx.preference.ListPreference
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
@ -28,7 +30,8 @@ class AppearanceSettings : PreferenceFragmentCompat() {
val accentColor = findPreference<Preference>("accent_color")
accentColor?.setOnPreferenceChangeListener { _, _ ->
requireMainActivityRestart = true
activity?.recreate()
val intent = Intent(context, SettingsActivity::class.java)
startActivity(intent)
true
}

4
app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt
View File

@ -2,6 +2,7 @@ package com.github.libretube.preferences
import android.Manifest
import android.content.ContentResolver
import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build
@ -135,7 +136,8 @@ class InstanceSettings : PreferenceFragmentCompat() {
val clearCustomInstances = findPreference<Preference>("clearCustomInstances")
clearCustomInstances?.setOnPreferenceClickListener {
PreferenceHelper.removePreference(requireContext(), "customInstances")
activity?.recreate()
val intent = Intent(context, SettingsActivity::class.java)
startActivity(intent)
true
}

22
app/src/main/res/drawable/ic_time_outlined.xml Normal file
View File

@ -0,0 +1,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?android:attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#00000000"
android:fillType="evenOdd"
android:pathData="M21.25,12C21.25,17.108 17.109,21.25 12,21.25C6.892,21.25 2.75,17.108 2.75,12C2.75,6.891 6.892,2.75 12,2.75C17.109,2.75 21.25,6.891 21.25,12Z"
android:strokeWidth="2.5"
android:strokeColor="#130F26"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#00000000"
android:pathData="M16.191,12.767L11.661,12.693V7.846"
android:strokeWidth="2.5"
android:strokeColor="#130F26"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</vector>

4
app/src/main/res/layout/activity_nointernet.xml
View File

@ -6,12 +6,12 @@
<ImageView
android:id="@+id/noInternet_settingsImageView"
android:padding="3dp"
android:layout_width="33dp"
android:layout_height="33dp"
android:layout_margin="16dp"
android:src="@drawable/ic_settings"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="3dp"
android:src="@drawable/ic_settings"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

115
app/src/main/res/layout/fragment_library.xml
View File

@ -11,79 +11,88 @@
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:id="@+id/showWatchHistory"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp"
android:background="?attr/selectableItemBackground"
android:orientation="vertical">
<TextView
<LinearLayout
android:id="@+id/showWatchHistory"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/watch_history"
android:textSize="20sp"/>
android:background="?attr/selectableItemBackground"
android:orientation="horizontal"
android:padding="10dp">
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="10dp"
android:src="@drawable/ic_time_outlined" />
<RelativeLayout
android:id="@+id/loginOrRegister2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:text="@string/watch_history"
android:textSize="18sp"
android:textStyle="bold" />
<ImageView
android:id="@+id/boogh"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerInParent="true"
android:layout_marginBottom="16dp"
android:src="@drawable/ic_login" />
</LinearLayout>
<TextView
android:id="@+id/text_like"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/boogh"
<RelativeLayout
android:id="@+id/loginOrRegister2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:gravity="center"
android:text="@string/please_login"
android:textSize="20sp"
android:textStyle="bold" />
</RelativeLayout>
android:layout_centerVertical="true">
<com.github.libretube.util.CustomSwipeToRefresh
android:id="@+id/playlist_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/boogh"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerInParent="true"
android:layout_marginBottom="16dp"
android:src="@drawable/ic_login" />
<ScrollView
android:id="@+id/scrollview_playlist"
<TextView
android:id="@+id/text_like"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/boogh"
android:layout_centerHorizontal="true"
android:gravity="center"
android:text="@string/please_login"
android:textSize="20sp"
android:textStyle="bold" />
</RelativeLayout>
<com.github.libretube.util.CustomSwipeToRefresh
android:id="@+id/playlist_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
<ScrollView
android:id="@+id/scrollview_playlist"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:descendantFocusability="blocksDescendants">
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/playlist_recView"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:nestedScrollingEnabled="false" />
android:descendantFocusability="blocksDescendants">
</RelativeLayout>
</LinearLayout>
</ScrollView>
</com.github.libretube.util.CustomSwipeToRefresh>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/playlist_recView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:nestedScrollingEnabled="false" />
</RelativeLayout>
</LinearLayout>
</ScrollView>
</com.github.libretube.util.CustomSwipeToRefresh>
</LinearLayout>

25
app/src/main/res/layout/fragment_watch_history.xml
View File

@ -7,22 +7,23 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="8dp"
android:layout_marginBottom="8dp" >
android:layout_marginBottom="8dp"
android:paddingHorizontal="8dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/watch_history"
android:layout_weight="1"
android:textSize="16sp" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/watch_history"
android:textSize="16sp" />
<ImageButton
<ImageView
android:id="@+id/clearHistory"
android:layout_gravity="center"
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/ic_trash"/>
android:layout_gravity="center"
android:layout_marginRight="5dp"
android:src="@drawable/ic_reset" />
</LinearLayout>
@ -31,6 +32,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:nestedScrollingEnabled="false"/>
android:nestedScrollingEnabled="false" />
</LinearLayout>

2
app/src/main/res/navigation/nav.xml
View File

@ -47,5 +47,5 @@
android:id="@+id/watchHistoryFragment"
android:name="com.github.libretube.fragments.WatchHistoryFragment"
android:label="@string/watch_history"
tools:layout="@layout/fragment_watch_history"/>
tools:layout="@layout/fragment_watch_history" />
</navigation>

2
app/src/main/res/values/strings.xml
View File

@ -207,5 +207,5 @@
<string name="deleteAccount_summary">Delete your Piped account</string>
<string name="account">Account</string>
<string name="restore">Restore</string>
<string name="watch_history">Watch history</string>
<string name="watch_history">Watch History</string>
</resources>

2
app/src/main/res/xml/advanced_settings.xml
View File

@ -50,7 +50,7 @@
<SwitchPreference
android:defaultValue="true"
android:icon="@drawable/ic_history_filled"
android:icon="@drawable/ic_time_outlined"
app:key="watch_history_toggle"
app:title="@string/watch_history" />