Update Prefix Resources

Lukas Dylan · lukasdylan · commit 25c18e4326ff · 2020-09-08T21:35:08.000+07:00
diff --git a/library/build.gradle b/library/build.gradle
@@ -41,20 +41,31 @@ android {
         textOutput "stdout"
         abortOnError false
     }
-    libraryVariants.all { variant ->
-        variant.outputs.all { output ->
-            if (outputFile != null && outputFileName.endsWith('.aar')) {
-                outputFileName = "${defaultConfig.name}-${defaultConfig.versionName}.aar"
-            }
-        }
-    }
+
     androidExtensions {
         experimental = true
     }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+            all {
+                useJUnitPlatform()
+            }
+        }
+    }
+
+    resourcePrefix 'protodroid_'
 }
 
+task sourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from android.sourceSets.main.java.srcDirs
+}
+
+install.dependsOn(sourcesJar)
+
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -8,13 +8,13 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:taskAffinity="id.lukasdylan.grpc.protodroid.task"
-            android:theme="@style/ProtodroidTheme" />
+            android:theme="@style/Protodroid.Theme" />
 
         <activity
             android:name=".internal.ui.detail.DetailActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:theme="@style/ProtodroidTheme" />
+            android:theme="@style/Protodroid.Theme" />
 
     </application>
 </manifest>
diff --git a/library/src/main/java/id/lukasdylan/grpc/protodroid/internal/service/ProtodroidNotificationListener.kt b/library/src/main/java/id/lukasdylan/grpc/protodroid/internal/service/ProtodroidNotificationListener.kt
@@ -44,14 +44,14 @@ internal class ProtodroidNotificationListenerImpl(private val context: Context)
         val summaryNotification = NotificationCompat.Builder(context, channelId)
             .setContentTitle(title)
             .setContentText(message)
-            .setSmallIcon(R.drawable.icon_notification)
+            .setSmallIcon(R.drawable.protodroid_icon_notification)
             .setStyle(NotificationCompat.InboxStyle())
             .setGroup("protodroid-group")
             .setGroupSummary(true)
             .build()
 
         val mBuilder = NotificationCompat.Builder(context, channelId)
-            .setSmallIcon(R.drawable.icon_notification)
+            .setSmallIcon(R.drawable.protodroid_icon_notification)
             .setContentTitle(title)
             .setContentText(message)
             .setStyle(NotificationCompat.BigTextStyle().bigText(message))
diff --git a/library/src/main/java/id/lukasdylan/grpc/protodroid/internal/ui/DataResponseAdapter.kt b/library/src/main/java/id/lukasdylan/grpc/protodroid/internal/ui/DataResponseAdapter.kt
@@ -11,7 +11,7 @@ import id.lukasdylan.grpc.protodroid.R
 import id.lukasdylan.grpc.protodroid.internal.ProtodroidDataDiffCallback
 import id.lukasdylan.grpc.protodroid.internal.database.ProtodroidDataEntity
 import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_protodroid_response.*
+import kotlinx.android.synthetic.main.protodroid_item_protodroid_response.*
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -21,7 +21,7 @@ class DataResponseAdapter(private val listener: (ProtodroidDataEntity) -> Unit)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DataResponseViewHolder {
         val itemView = LayoutInflater.from(parent.context)
-            .inflate(R.layout.item_protodroid_response, parent, false)
+            .inflate(R.layout.protodroid_item_protodroid_response, parent, false)
         return DataResponseViewHolder(itemView, listener)
     }
 
diff --git a/library/src/main/java/id/lukasdylan/grpc/protodroid/internal/ui/MainActivity.kt b/library/src/main/java/id/lukasdylan/grpc/protodroid/internal/ui/MainActivity.kt
@@ -16,7 +16,7 @@ import id.lukasdylan.grpc.protodroid.internal.repository.InternalProtodroidRepos
 import id.lukasdylan.grpc.protodroid.internal.ui.detail.DetailActivity
 import id.lukasdylan.grpc.protodroid.internal.viewmodel.MainViewModel
 import id.lukasdylan.grpc.protodroid.internal.viewmodel.MainViewModelFactory
-import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.protodroid_activity_main.*
 
 class MainActivity : AppCompatActivity(), Observer<List<ProtodroidDataEntity>> {
 
@@ -41,7 +41,7 @@ class MainActivity : AppCompatActivity(), Observer<List<ProtodroidDataEntity>> {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        setContentView(R.layout.protodroid_activity_main)
         checkDeepLinkData()
         toolbar?.apply {
             setSupportActionBar(this)
@@ -56,7 +56,7 @@ class MainActivity : AppCompatActivity(), Observer<List<ProtodroidDataEntity>> {
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.menu_main, menu)
+        menuInflater.inflate(R.menu.protodroid_menu_main, menu)
         return true
     }
 
diff --git a/library/src/main/java/id/lukasdylan/grpc/protodroid/internal/ui/detail/DetailActivity.kt b/library/src/main/java/id/lukasdylan/grpc/protodroid/internal/ui/detail/DetailActivity.kt
@@ -9,13 +9,13 @@ import id.lukasdylan.grpc.protodroid.internal.Protodroid
 import id.lukasdylan.grpc.protodroid.internal.repository.InternalProtodroidRepositoryImpl
 import id.lukasdylan.grpc.protodroid.internal.viewmodel.DetailViewModel
 import id.lukasdylan.grpc.protodroid.internal.viewmodel.DetailViewModelFactory
-import kotlinx.android.synthetic.main.activity_detail.*
+import kotlinx.android.synthetic.main.protodroid_activity_detail.*
 
 class DetailActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_detail)
+        setContentView(R.layout.protodroid_activity_detail)
 
         toolbar?.apply {
             setSupportActionBar(this)
diff --git a/library/src/main/java/id/lukasdylan/grpc/protodroid/internal/ui/detail/InformationAdapter.kt b/library/src/main/java/id/lukasdylan/grpc/protodroid/internal/ui/detail/InformationAdapter.kt
@@ -8,15 +8,15 @@ import androidx.core.widget.TextViewCompat
 import androidx.recyclerview.widget.RecyclerView
 import id.lukasdylan.grpc.protodroid.R
 import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_protodroid_detail_response.*
+import kotlinx.android.synthetic.main.protodroid_item_protodroid_detail_response.*
 
 class InformationAdapter : RecyclerView.Adapter<InformationViewHolder>() {
 
     private var data: List<Pair<String, String>> = emptyList()
 
     override fun onCreateViewHolder(parent: ViewGroup, p1: Int): InformationViewHolder {
         val view = LayoutInflater.from(parent.context)
-            .inflate(R.layout.item_protodroid_detail_response, parent, false)
+            .inflate(R.layout.protodroid_item_protodroid_detail_response, parent, false)
         return InformationViewHolder(view)
     }
 
diff --git a/library/src/main/java/id/lukasdylan/grpc/protodroid/internal/ui/detail/InformationFragment.kt b/library/src/main/java/id/lukasdylan/grpc/protodroid/internal/ui/detail/InformationFragment.kt
@@ -10,7 +10,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import id.lukasdylan.grpc.protodroid.R
 import id.lukasdylan.grpc.protodroid.internal.viewmodel.DetailViewModel
-import kotlinx.android.synthetic.main.fragment_information.*
+import kotlinx.android.synthetic.main.protodroid_fragment_information.*
 
 class InformationFragment : Fragment(), Observer<List<Pair<String, String>>> {
 
@@ -23,7 +23,7 @@ class InformationFragment : Fragment(), Observer<List<Pair<String, String>>> {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.fragment_information, container, false)
+        return inflater.inflate(R.layout.protodroid_fragment_information, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/library/src/main/res/drawable/protodroid_icon_back.xml b/library/src/main/res/drawable/protodroid_icon_back.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/vector_delete"/>
+    <item android:drawable="@drawable/protodroid_vector_arrow_back"/>
 </selector>
diff --git a/library/src/main/res/drawable/protodroid_icon_delete.xml b/library/src/main/res/drawable/protodroid_icon_delete.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/vector_arrow_back"/>
+    <item android:drawable="@drawable/protodroid_vector_delete"/>
 </selector>
diff --git a/library/src/main/res/drawable/protodroid_icon_notification.xml b/library/src/main/res/drawable/protodroid_icon_notification.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/vector_notification"/>
+    <item android:drawable="@drawable/protodroid_vector_notification"/>
 </selector>
diff --git a/library/src/main/res/drawable/protodroid_vector_arrow_back.xml b/library/src/main/res/drawable/protodroid_vector_arrow_back.xml
diff --git a/library/src/main/res/drawable/protodroid_vector_delete.xml b/library/src/main/res/drawable/protodroid_vector_delete.xml
diff --git a/library/src/main/res/drawable/protodroid_vector_notification.xml b/library/src/main/res/drawable/protodroid_vector_notification.xml
diff --git a/library/src/main/res/layout/protodroid_activity_detail.xml b/library/src/main/res/layout/protodroid_activity_detail.xml
@@ -19,8 +19,8 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:navigationIcon="@drawable/icon_back"
-            app:titleTextAppearance="@style/ProtodroidToolbarTitleTheme"
+            app:navigationIcon="@drawable/protodroid_icon_back"
+            app:titleTextAppearance="@style/Protodroid.ToolbarTitleTheme"
             app:titleTextColor="@android:color/white"
             tools:title="Service Name" />
 
@@ -31,7 +31,7 @@
             android:background="@android:color/black"
             app:tabIndicatorColor="@android:color/white"
             app:tabSelectedTextColor="@android:color/white"
-            app:tabTextAppearance="@style/ProtodroidToolbarSubtitleTheme"
+            app:tabTextAppearance="@style/Protodroid.ToolbarSubtitleTheme"
             app:tabTextColor="@android:color/darker_gray" />
 
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/library/src/main/res/layout/protodroid_activity_main.xml b/library/src/main/res/layout/protodroid_activity_main.xml
@@ -17,9 +17,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:subtitle="by Protodroid"
-            app:subtitleTextAppearance="@style/ProtodroidToolbarSubtitleTheme"
+            app:subtitleTextAppearance="@style/Protodroid.ToolbarSubtitleTheme"
             app:subtitleTextColor="@android:color/white"
-            app:titleTextAppearance="@style/ProtodroidToolbarTitleTheme"
+            app:titleTextAppearance="@style/Protodroid.ToolbarTitleTheme"
             app:titleTextColor="@android:color/white"
             tools:title="APK Name" />
 
diff --git a/library/src/main/res/layout/protodroid_fragment_information.xml b/library/src/main/res/layout/protodroid_fragment_information.xml
@@ -13,6 +13,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:listitem="@layout/item_protodroid_detail_response" />
+        tools:listitem="@layout/protodroid_item_protodroid_detail_response" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/library/src/main/res/layout/protodroid_item_protodroid_detail_response.xml b/library/src/main/res/layout/protodroid_item_protodroid_detail_response.xml
diff --git a/library/src/main/res/layout/protodroid_item_protodroid_response.xml b/library/src/main/res/layout/protodroid_item_protodroid_response.xml
diff --git a/library/src/main/res/menu/protodroid_menu_main.xml b/library/src/main/res/menu/protodroid_menu_main.xml
@@ -8,7 +8,7 @@
         android:id="@+id/action_delete"
         android:orderInCategory="100"
         android:title="Delete"
-        android:icon="@drawable/icon_delete"
+        android:icon="@drawable/protodroid_icon_delete"
         app:showAsAction="always" />
 
 </menu>
diff --git a/library/src/main/res/values/public.xml b/library/src/main/res/values/public.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <public />
+</resources>
diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="ProtodroidTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+
+    <style name="Protodroid.BaseTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@android:color/black</item>
         <item name="colorPrimaryDark">@android:color/black</item>
@@ -10,11 +11,13 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="ProtodroidToolbarTitleTheme" parent="TextAppearance.AppCompat.Title">
+    <style name="Protodroid.Theme" parent="Protodroid.BaseTheme" />
+
+    <style name="Protodroid.ToolbarTitleTheme" parent="TextAppearance.AppCompat.Title">
         <item name="android:fontFamily">monospace</item>
     </style>
 
-    <style name="ProtodroidToolbarSubtitleTheme" parent="TextAppearance.AppCompat.Body2">
+    <style name="Protodroid.ToolbarSubtitleTheme" parent="TextAppearance.AppCompat.Body2">
         <item name="android:fontFamily">monospace</item>
     </style>
 </resources>
