App Lounge: conflict resolved (caed975b) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/api/fused/FusedAPIRepository.kt

+0 −13

Original line number	Diff line number	Diff line
		@@ -94,17 +94,4 @@ class FusedAPIRepository @Inject constructor(
		suspend fun listApps(category: String, browseUrl: String, authData: AuthData): List<FusedApp>? {
		return fusedAPIImpl.listApps(category, browseUrl, authData)
		}

		suspend fun getAppsListBasedOnCategory(
		category: String,
		browseUrl: String,
		authData: AuthData,
		source: String
		): List<FusedApp> {
		return when (source) {
		"Open Source" -> fusedAPIImpl.getOpenSourceApps(category) ?: listOf()
		"PWA" -> fusedAPIImpl.getPWAApps(category) ?: listOf()
		else -> fusedAPIImpl.getPlayStoreApps(browseUrl, authData)
		}
		}
		}

app/src/main/java/foundation/e/apps/application/ApplicationFragment.kt

+0 −4

Original line number	Diff line number	Diff line
		@@ -22,11 +22,7 @@ import android.app.Dialog
		import android.content.Intent
		import android.os.Bundle
		import android.text.Html
		<<<<<<< HEAD
		import android.text.SpannableString
		=======
		import android.text.method.LinkMovementMethod
		>>>>>>> 6d9552e (App Lounge: Refactoring)
		import android.util.Log
		import android.view.LayoutInflater
		import android.view.View

app/src/main/res/layout/dialog_trackers_layout.xml

+31 −6

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_height="wrap_content"
		xmlns:app="http://schemas.android.com/apk/res-auto">

		<TextView
		@@ -19,25 +19,50 @@

		<TextView
		android:id="@+id/trackers_list"
		android:layout_width="wrap_content"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:textSize="16sp"
		android:textSize="18sp"
		android:textColor="@android:color/black"
		android:text="@string/no_tracker_found"
		app:layout_constraintTop_toBottomOf="@+id/title"
		app:layout_constraintLeft_toLeftOf="@+id/title"
		app:layout_constraintRight_toRightOf="parent"
		android:layout_marginEnd="20dp"
		android:layout_marginTop="20dp"
		/>

		<View
		android:layout_width="match_parent"
		android:layout_height="1dp"
		app:layout_constraintTop_toTopOf="parent"/>
		<TextView
		android:layout_width="wrap_content"
		android:id="@+id/privacyLinkText"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:textSize="16sp"
		android:text="@string/privacy_computed_using_text"
		android:linksClickable="true"
		android:textColor="@color/app_info_text_color_grey"
		app:layout_constraintTop_toBottomOf="@+id/trackers_list"
		app:layout_constraintLeft_toLeftOf="@id/trackers_list"
		app:layout_constraintRight_toRightOf="parent"
		android:layout_marginEnd="20dp"
		android:layout_marginTop="20dp"
		/>

		<TextView
		android:id="@+id/ok"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="OK"
		android:textSize="18sp"
		android:textColor="@color/colorAccent"
		android:padding="10dp"
		android:layout_marginEnd="20dp"
		android:layout_marginTop="20dp"
		android:layout_marginBottom="20dp"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintRight_toRightOf="parent"
		app:layout_constraintTop_toBottomOf="@+id/privacyLinkText"
		/>

		</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/colors.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,4 +28,5 @@

		<!-- Shimmer Animation -->
		<color name="colorGrey">#f2f2f2</color>
		<color name="app_info_text_color_grey">#A4AEB7</color>
		</resources>
		No newline at end of file

gradlew

100644 → 100755

+0 −0

File mode changed from 100644 to 100755.

View file