Continue reworking repos, lib updates, permissions for gradlew, workf…

…low dispatch and other small stuff
DerTyp7214 · Dec 21, 2021 · 750829a · 750829a
1 parent 97e44f8
commit 750829a
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 45 deletions.
diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml
@@ -10,6 +10,7 @@ on:
       - 'gradle.properties'
       - 'settings.gradle.kts'
       - '.github/workflows/buildCi.yml'
+  workflow_dispatch:
 
 jobs:
   buildMaster:
@@ -53,11 +54,14 @@ jobs:
         run: echo "::set-output name=BRANCH_NAME::$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')"
         id: extract_branch
 
+      - name: File Permissions
+        run: chmod +x gradlew
+
       - name: Build apk
         id: buildAllApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: release-candidate
+          gradle-version: wrapper
           arguments: assembleDebug
 
       - name: Get JSON
@@ -168,11 +172,14 @@ jobs:
         run: echo "::set-output name=BRANCH_NAME::$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//_/g')"
         id: extract_branch
 
+      - name: File Permissions
+        run: chmod +x gradlew
+
       - name: Build apk
         id: buildAllApks
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: release-candidate
+          gradle-version: wrapper
           arguments: assembleRelease
 
       - name: Get JSON

diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml
@@ -46,7 +46,7 @@ jobs:
         id: buildAllApks
         uses: eskatos/gradle-command-action@v1.3.3
         with:
-          gradle-version: current
+          gradle-version: wrapper
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -3,3 +3,5 @@
 [![Download rCompatible](https://img.shields.io/github/downloads/DerTyp7214/RboardThemeManagerV3/latest-rCompatible/total)](https://github.com/DerTyp7214/RboardThemeManagerV3/releases/tag/latest-rCompatible)
 [![Download Apk](https://img.shields.io/badge/dynamic/json.svg?label=download&url=https://api.github.com/repos/DerTyp7214/RboardThemeManagerV3/releases/tags/latest-rCompatible&query=$.assets[0].name)](https://github.com/DerTyp7214/RboardThemeManagerV3/releases/download/latest-rCompatible/app-release.apk)
 [![Build R Compatible](https://github.com/DerTyp7214/RboardThemeManagerV3/actions/workflows/buildRCompatible.yml/badge.svg?branch=rCompatible)](https://github.com/DerTyp7214/RboardThemeManagerV3/actions/workflows/buildCi.yml?query=branch%3ArCompatible)
+
+[Project-page](https://github.com/GboardThemes)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -55,13 +55,13 @@ android {
 }
 
 dependencies {
-    implementation(platform("com.google.firebase:firebase-bom:29.0.2"))
+    implementation(platform("com.google.firebase:firebase-bom:29.0.3"))
     implementation("com.google.firebase:firebase-messaging-ktx:23.0.0")
-    implementation("com.google.firebase:firebase-analytics-ktx:20.0.1")
+    implementation("com.google.firebase:firebase-analytics-ktx:20.0.2")
 
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.4.0-beta02")
-    implementation("androidx.navigation:navigation-ui-ktx:2.4.0-beta02")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.4.0-rc01")
+    implementation("androidx.navigation:navigation-ui-ktx:2.4.0-rc01")
     implementation("org.apache.commons:commons-text:1.9")
 
     implementation("com.github.topjohnwu.libsu:core:$libsuVersion")
@@ -71,19 +71,19 @@ dependencies {
     implementation("androidx.core:core-ktx:1.7.0")
     //noinspection DifferentStdlibGradleVersion
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10")
-    implementation("androidx.appcompat:appcompat:1.3.1")
+    implementation("androidx.core:core:1.7.0")
     implementation("com.google.android.material:material:1.6.0-alpha01")
     implementation("androidx.constraintlayout:constraintlayout:2.1.2")
-    implementation("androidx.preference:preference-ktx:1.2.0-beta01")
+    implementation("androidx.preference:preference-ktx:1.2.0-rc01")
     implementation("androidx.activity:activity-ktx:1.4.0")
     implementation("androidx.fragment:fragment-ktx:1.4.0")
     implementation("com.jaredrummler:android-shell:1.0.0")
-    implementation("com.google.firebase:firebase-analytics:20.0.1")
+    implementation("com.google.firebase:firebase-analytics:20.0.2")
     implementation("com.google.firebase:firebase-messaging:23.0.0")
     implementation("com.google.code.gson:gson:2.8.9")
     implementation("com.bignerdranch.android:simple-item-decoration:1.0.0")
     implementation("de.dertyp7214:PRDownloader:v0.6.0")
-    implementation("com.github.skydoves:balloon:1.4.0")
+    implementation("com.github.skydoves:balloon:1.4.1")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.4-alpha03")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0-alpha03")
@@ -94,6 +94,6 @@ dependencies {
     implementation("com.github.murgupluoglu:flagkit-android:1.0.2")
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
 
-    debugImplementation("androidx.compose.ui:ui-tooling:1.1.0-beta04")
+    debugImplementation("androidx.compose.ui:ui-tooling:1.1.0-rc01")
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.10")
 }
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/Config.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/Config.kt
@@ -51,6 +51,9 @@ object Config {
         )
     val REPOS = ArrayList(PACKS_URLS)
 
+    // TODO: add repo button should load list of verified repos
+    const val REPOS_LIST_URL =
+        "https://raw.githubusercontent.com/GboardThemes/Repositories/main/repos.json"
     const val SOUNDS_PACKS_URL =
         "https://raw.githubusercontent.com/GboardThemes/Soundpack/master/download_sounds.json"
 

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/adapter/ThemePackAdapter.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/adapter/ThemePackAdapter.kt
@@ -1,5 +1,6 @@
 package de.dertyp7214.rboardthememanager.adapter
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.view.LayoutInflater
@@ -33,8 +34,8 @@ class ThemePackAdapter(
         val lastUpdate: TextView = v.findViewById(R.id.lastUpdate)
     }
 
-    class NewsViewHolder(v: View) : RecyclerView.ViewHolder(v) {
-        val newsCards: NewsCards = v as NewsCards
+    class NewsViewHolder(v: NewsCards) : RecyclerView.ViewHolder(v) {
+        val newsCards: NewsCards = v
     }
 
     override fun getItemId(position: Int): Long {
@@ -46,12 +47,19 @@ class ThemePackAdapter(
         return ViewHolder(LayoutInflater.from(activity).inflate(R.layout.pack_item, parent, false))
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         val themePack = list[position]
 
         if (holder is ViewHolder) {
             holder.size.text =
-                themePack.size.zeroOrElse { it.toHumanReadableBytes(activity) } ?: ""
+                "${themePack.themes?.size?.let { "($it)" } ?: ""} ${
+                    themePack.size.zeroOrElse {
+                        it.toHumanReadableBytes(
+                            activity
+                        )
+                    } ?: ""
+                }"
             holder.title.text = themePack.name
             holder.author.text = themePack.author
             holder.lastUpdate.text = themePack.date.format(System.currentTimeMillis())
@@ -98,7 +106,7 @@ class ThemePackAdapter(
         }
     }
 
-    override fun getItemViewType(position: Int): Int = position
+    override fun getItemViewType(position: Int): Int = if (list[position].none) 0 else 1
 
     override fun getItemCount(): Int = list.size
 }
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/components/NewsCards.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/components/NewsCards.kt
@@ -32,9 +32,7 @@ class NewsCards(context: Context, attrs: AttributeSet? = null) : LinearLayout(co
     init {
         inflate(context, R.layout.news_card, this)
 
-        newsFeedAdapter = NewsFeedAdapter(cards) {
-            clickNewsListener(it)
-        }
+        newsFeedAdapter = NewsFeedAdapter(cards, clickNewsListener)
         recyclerView = findViewById(R.id.recyclerViewNews)
 
         val snapHelper = LinearSnapHelper()

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Repos.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Repos.kt
@@ -111,13 +111,7 @@ class Repos(
         fab.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.ic_baseline_add_24))
         fab.setOnClickListener {
             activity.openInputDialog(R.string.repository) { dialog, text ->
-                doAsync({
-                    try {
-                        "true:$text".parseRepo()
-                    } catch (e: Exception) {
-                        null
-                    }
-                }) {
+                doAsync("true:$text"::parseRepo) {
                     dialog.dismiss()
                     if (it != null) {
                         repositories.add(it)

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ManageRepo.kt
@@ -11,9 +11,11 @@ import de.dertyp7214.rboardthememanager.R
 import de.dertyp7214.rboardthememanager.adapter.ManageRepoThemePackAdapter
 import de.dertyp7214.rboardthememanager.components.LayoutManager
 import de.dertyp7214.rboardthememanager.core.getTextFromUrl
+import de.dertyp7214.rboardthememanager.core.safeParse
 import de.dertyp7214.rboardthememanager.data.ThemePack
 import de.dertyp7214.rboardthememanager.databinding.ActivityManageRepoBinding
 import de.dertyp7214.rboardthememanager.utils.doAsync
+import org.json.JSONObject
 import java.net.URL
 
 class ManageRepo : AppCompatActivity() {
@@ -84,6 +86,14 @@ class ManageRepo : AppCompatActivity() {
             items.addAll(themes)
             adapter.notifyDataSetChanged()
         }
+
+        doAsync(URL(key.replace("list.json", "meta.json"))::getTextFromUrl) { text ->
+            if (text.isNotEmpty()) {
+                JSONObject().safeParse(text).getString("name").let { name ->
+                    if (name.isNotEmpty()) toolbar.title = name
+                }
+            }
+        }
     }
 
     private fun setAction(action: Action) {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.2.0-alpha05")
+        classpath("com.android.tools.build:gradle:7.2.0-alpha06")
         //noinspection DifferentKotlinGradleVersion
         classpath(kotlin("gradle-plugin", version = "1.6.0"))
         classpath("com.google.gms:google-services:4.3.10")

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Dec 07 07:49:33 CET 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.4-20211214231059+0000-all.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.4-20211220231647+0000-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME