Rename resources

samtstern · samtstern · commit 7324fc3adb81 · 2019-01-22T12:23:23.000-08:00
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/CopyPresenter.kt b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/CopyPresenter.kt
@@ -7,7 +7,7 @@ import com.google.firebase.dynamicinvites.R
 import com.google.firebase.dynamicinvites.kotlin.model.InviteContent
 
 class CopyPresenter(isAvailable: Boolean, content: InviteContent)
-    : InvitePresenter("Copy Link", R.drawable.ic_content_copy_black_24dp, isAvailable, content) {
+    : InvitePresenter("Copy Link", R.drawable.ic_content_copy, isAvailable, content) {
 
     override fun sendInvite(context: Context) {
         super.sendInvite(context)
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/EmailPresenter.kt b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/EmailPresenter.kt
@@ -7,7 +7,7 @@ import com.google.firebase.dynamicinvites.R
 import com.google.firebase.dynamicinvites.kotlin.model.InviteContent
 
 class EmailPresenter(isAvailable: Boolean, content: InviteContent)
-    : InvitePresenter("Email", R.drawable.ic_email_black_24dp, isAvailable, content) {
+    : InvitePresenter("Email", R.drawable.ic_email, isAvailable, content) {
 
     override fun sendInvite(context: Context) {
         super.sendInvite(context)
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/MessagePresenter.kt b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/MessagePresenter.kt
@@ -7,7 +7,7 @@ import com.google.firebase.dynamicinvites.R
 import com.google.firebase.dynamicinvites.kotlin.model.InviteContent
 
 class MessagePresenter(isAvailable: Boolean, content: InviteContent)
-    : InvitePresenter("Message", R.drawable.ic_sms_black_24dp, isAvailable, content) {
+    : InvitePresenter("Message", R.drawable.ic_sms, isAvailable, content) {
 
     override fun sendInvite(context: Context) {
         super.sendInvite(context)
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/MorePresenter.kt b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/MorePresenter.kt
@@ -7,7 +7,7 @@ import com.google.firebase.dynamicinvites.kotlin.model.InviteContent
 import com.google.firebase.dynamicinvites.util.DynamicLinksUtil
 
 class MorePresenter(isAvailable: Boolean, content: InviteContent)
-    : InvitePresenter("More", R.drawable.ic_more_horiz_black_24dp, isAvailable, content) {
+    : InvitePresenter("More", R.drawable.ic_more_horiz, isAvailable, content) {
 
     override fun sendInvite(context: Context) {
         super.sendInvite(context)
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/SocialPresenter.kt b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/SocialPresenter.kt
@@ -7,7 +7,7 @@ import com.google.firebase.dynamicinvites.R
 import com.google.firebase.dynamicinvites.kotlin.model.InviteContent
 
 class SocialPresenter(isAvailable: Boolean, content: InviteContent)
-    : InvitePresenter("Social", R.drawable.ic_people_black_24dp, isAvailable, content) {
+    : InvitePresenter("Social", R.drawable.ic_people, isAvailable, content) {
 
     override fun sendInvite(context: Context) {
         super.sendInvite(context)
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/AdvancedActivity.kt b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/AdvancedActivity.kt
@@ -5,15 +5,15 @@ import android.support.v7.app.AppCompatActivity
 
 import com.google.firebase.dynamicinvites.R
 import com.google.firebase.dynamicinvites.kotlin.presenter.InvitePresenter
-import kotlinx.android.synthetic.main.activity_advanced.button_share
+import kotlinx.android.synthetic.main.activity_main.buttonShare
 
 class AdvancedActivity : AppCompatActivity(), ShareDialogFragment.Listener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_advanced)
 
-        button_share.setOnClickListener {
+        buttonShare.setOnClickListener {
             ShareDialogFragment.newInstance().show(supportFragmentManager, "dialog")
         }
     }
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/MainActivity.kt b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/MainActivity.kt
@@ -5,15 +5,15 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import com.google.firebase.dynamicinvites.R
 import com.google.firebase.dynamicinvites.kotlin.util.DynamicLinksUtil
-import kotlinx.android.synthetic.main.activity_main.button_share
+import kotlinx.android.synthetic.main.activity_main.buttonShare
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        button_share.setOnClickListener {
+        buttonShare.setOnClickListener {
             onShareClicked()
         }
     }
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/ShareDialogFragment.kt b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/ShareDialogFragment.kt
@@ -17,8 +17,8 @@ import com.google.firebase.dynamicinvites.kotlin.presenter.MorePresenter
 import com.google.firebase.dynamicinvites.kotlin.presenter.SocialPresenter
 import com.google.firebase.dynamicinvites.kotlin.util.DynamicLinksUtil
 import kotlinx.android.synthetic.main.fragment_item_list_dialog.recycler
-import kotlinx.android.synthetic.main.item_share_method.view.item_icon
-import kotlinx.android.synthetic.main.item_share_method.view.item_name
+import kotlinx.android.synthetic.main.item_share_method.view.itemIcon
+import kotlinx.android.synthetic.main.item_share_method.view.itemName
 import java.util.Arrays
 
 /**
@@ -83,8 +83,8 @@ class ShareDialogFragment : BottomSheetDialogFragment() {
         : RecyclerView.ViewHolder(inflater.inflate(R.layout.item_share_method, parent, false)) {
 
         internal fun bind(presenter: InvitePresenter) {
-            itemView.item_name.text = presenter.name
-            itemView.item_icon.setImageResource(presenter.icon)
+            itemView.itemName.text = presenter.name
+            itemView.itemIcon.setImageResource(presenter.icon)
 
             itemView.setOnClickListener {
                 listener?.onItemClicked(presenter)
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/CopyPresenter.java b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/CopyPresenter.java
@@ -9,7 +9,7 @@
 public class CopyPresenter extends InvitePresenter {
 
     public CopyPresenter(boolean isAvailable, InviteContent content) {
-        super("Copy Link", R.drawable.ic_content_copy_black_24dp, isAvailable, content);
+        super("Copy Link", R.drawable.ic_content_copy, isAvailable, content);
     }
 
     @Override
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/EmailPresenter.java b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/EmailPresenter.java
@@ -9,7 +9,7 @@
 public class EmailPresenter extends InvitePresenter {
 
     public EmailPresenter(boolean isAvailable, InviteContent content) {
-        super("Email", R.drawable.ic_email_black_24dp, isAvailable, content);
+        super("Email", R.drawable.ic_email, isAvailable, content);
     }
 
     @Override
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/MessagePresenter.java b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/MessagePresenter.java
@@ -9,7 +9,7 @@
 public class MessagePresenter extends InvitePresenter {
 
     public MessagePresenter(boolean isAvailable, InviteContent content) {
-        super("Message", R.drawable.ic_sms_black_24dp, isAvailable, content);
+        super("Message", R.drawable.ic_sms, isAvailable, content);
     }
 
     @Override
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/MorePresenter.java b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/MorePresenter.java
@@ -11,7 +11,7 @@
 public class MorePresenter extends InvitePresenter {
 
     public MorePresenter(boolean isAvailable, InviteContent content) {
-        super("More", R.drawable.ic_more_horiz_black_24dp, isAvailable, content);
+        super("More", R.drawable.ic_more_horiz, isAvailable, content);
     }
 
     @Override
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/SocialPresenter.java b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/SocialPresenter.java
@@ -9,7 +9,7 @@
 public class SocialPresenter extends InvitePresenter {
 
     public SocialPresenter(boolean isAvailable, InviteContent content) {
-        super("Social", R.drawable.ic_people_black_24dp, isAvailable, content);
+        super("Social", R.drawable.ic_people, isAvailable, content);
     }
 
     @Override
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/view/AdvancedActivity.java b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/view/AdvancedActivity.java
@@ -14,7 +14,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_advanced);
 
-        findViewById(R.id.button_share).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.buttonShare).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 ShareDialogFragment.newInstance().show(getSupportFragmentManager(), "dialog");
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/view/MainActivity.java b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/view/MainActivity.java
@@ -16,7 +16,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        findViewById(R.id.button_share).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.buttonShare).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 onShareClicked();
diff --git a/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/view/ShareDialogFragment.java b/dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/view/ShareDialogFragment.java
@@ -101,8 +101,8 @@ private class ViewHolder extends RecyclerView.ViewHolder {
         ViewHolder(LayoutInflater inflater, ViewGroup parent) {
             super(inflater.inflate(R.layout.item_share_method, parent, false));
 
-            text = itemView.findViewById(R.id.item_name);
-            icon = itemView.findViewById(R.id.item_icon);
+            text = itemView.findViewById(R.id.itemName);
+            icon = itemView.findViewById(R.id.itemIcon);
 
             itemView.setOnClickListener(
                     new View.OnClickListener() {
diff --git a/dl-invites/app/src/main/res/drawable/ic_content_copy.xml b/dl-invites/app/src/main/res/drawable/ic_content_copy.xml
diff --git a/dl-invites/app/src/main/res/drawable/ic_email.xml b/dl-invites/app/src/main/res/drawable/ic_email.xml
diff --git a/dl-invites/app/src/main/res/drawable/ic_more_horiz.xml b/dl-invites/app/src/main/res/drawable/ic_more_horiz.xml
diff --git a/dl-invites/app/src/main/res/drawable/ic_people.xml b/dl-invites/app/src/main/res/drawable/ic_people.xml
diff --git a/dl-invites/app/src/main/res/drawable/ic_sms.xml b/dl-invites/app/src/main/res/drawable/ic_sms.xml
diff --git a/dl-invites/app/src/main/res/layout/activity_advanced.xml b/dl-invites/app/src/main/res/layout/activity_advanced.xml
@@ -16,7 +16,7 @@
         android:layout_marginBottom="8dp"
         android:background="#FFFFFF"
         app:cardCornerRadius="10dp"
-        app:layout_constraintBottom_toTopOf="@+id/button_share"
+        app:layout_constraintBottom_toTopOf="@+id/buttonShare"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -48,7 +48,7 @@
     </android.support.v7.widget.CardView>
 
     <Button
-        android:id="@+id/button_share"
+        android:id="@+id/buttonShare"
         style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/dl-invites/app/src/main/res/layout/activity_main.xml b/dl-invites/app/src/main/res/layout/activity_main.xml
@@ -15,13 +15,13 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:src="@drawable/pizza_monster"
-        app:layout_constraintBottom_toTopOf="@+id/field_link"
+        app:layout_constraintBottom_toTopOf="@+id/fieldLink"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/field_link"
+        android:id="@+id/fieldLink"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginBottom="16dp"
@@ -30,12 +30,12 @@
         android:text="@string/example_link"
         android:textColor="#FFFFFF"
         android:textSize="14sp"
-        app:layout_constraintBottom_toTopOf="@+id/button_share"
+        app:layout_constraintBottom_toTopOf="@+id/buttonShare"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
     <Button
-        android:id="@+id/button_share"
+        android:id="@+id/buttonShare"
         style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/dl-invites/app/src/main/res/layout/item_share_method.xml b/dl-invites/app/src/main/res/layout/item_share_method.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content">
 
     <ImageView
-        android:id="@+id/item_icon"
+        android:id="@+id/itemIcon"
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_marginStart="16dp"
@@ -15,19 +15,19 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/ic_people_black_24dp" />
+        tools:src="@drawable/ic_people" />
 
     <TextView
-        android:id="@+id/item_name"
+        android:id="@+id/itemName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="8dp"
         android:textSize="16sp"
-        app:layout_constraintBottom_toBottomOf="@+id/item_icon"
+        app:layout_constraintBottom_toBottomOf="@+id/itemIcon"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/item_icon"
-        app:layout_constraintTop_toTopOf="@+id/item_icon"
+        app:layout_constraintStart_toEndOf="@+id/itemIcon"
+        app:layout_constraintTop_toTopOf="@+id/itemIcon"
         app:layout_constraintHorizontal_bias="0"
         tools:text="Social" />
 

Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,15 @@ import android.support.v7.app.AppCompatActivity`
`5`	`5`
`6`	`6`	`import com.google.firebase.dynamicinvites.R`
`7`	`7`	`import com.google.firebase.dynamicinvites.kotlin.presenter.InvitePresenter`
`8`		`-import kotlinx.android.synthetic.main.activity_advanced.button_share`
	`8`	`+import kotlinx.android.synthetic.main.activity_main.buttonShare`
`9`	`9`
`10`	`10`	`class AdvancedActivity : AppCompatActivity(), ShareDialogFragment.Listener {`
`11`	`11`
`12`	`12`	`override fun onCreate(savedInstanceState: Bundle?) {`
`13`	`13`	`super.onCreate(savedInstanceState)`
`14`	`14`	`setContentView(R.layout.activity_advanced)`
`15`	`15`
`16`		`- button_share.setOnClickListener {`
	`16`	`+ buttonShare.setOnClickListener {`
`17`	`17`	`ShareDialogFragment.newInstance().show(supportFragmentManager, "dialog")`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`public class CopyPresenter extends InvitePresenter {`
`10`	`10`
`11`	`11`	`public CopyPresenter(boolean isAvailable, InviteContent content) {`
`12`		`- super("Copy Link", R.drawable.ic_content_copy_black_24dp, isAvailable, content);`
	`12`	`+ super("Copy Link", R.drawable.ic_content_copy, isAvailable, content);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`public class EmailPresenter extends InvitePresenter {`
`10`	`10`
`11`	`11`	`public EmailPresenter(boolean isAvailable, InviteContent content) {`
`12`		`- super("Email", R.drawable.ic_email_black_24dp, isAvailable, content);`
	`12`	`+ super("Email", R.drawable.ic_email, isAvailable, content);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`@Override`