Skip to content

Commit 7324fc3

Browse files
samtsternsamtstern
committed
Rename resources
1 parent 4f0c8b3 commit 7324fc3

24 files changed

+34
-34
lines changed

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/CopyPresenter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.google.firebase.dynamicinvites.R
77
import com.google.firebase.dynamicinvites.kotlin.model.InviteContent
88

99
class CopyPresenter(isAvailable: Boolean, content: InviteContent)
10-
: InvitePresenter("Copy Link", R.drawable.ic_content_copy_black_24dp, isAvailable, content) {
10+
: InvitePresenter("Copy Link", R.drawable.ic_content_copy, isAvailable, content) {
1111

1212
override fun sendInvite(context: Context) {
1313
super.sendInvite(context)

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/EmailPresenter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.google.firebase.dynamicinvites.R
77
import com.google.firebase.dynamicinvites.kotlin.model.InviteContent
88

99
class EmailPresenter(isAvailable: Boolean, content: InviteContent)
10-
: InvitePresenter("Email", R.drawable.ic_email_black_24dp, isAvailable, content) {
10+
: InvitePresenter("Email", R.drawable.ic_email, isAvailable, content) {
1111

1212
override fun sendInvite(context: Context) {
1313
super.sendInvite(context)

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/MessagePresenter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.google.firebase.dynamicinvites.R
77
import com.google.firebase.dynamicinvites.kotlin.model.InviteContent
88

99
class MessagePresenter(isAvailable: Boolean, content: InviteContent)
10-
: InvitePresenter("Message", R.drawable.ic_sms_black_24dp, isAvailable, content) {
10+
: InvitePresenter("Message", R.drawable.ic_sms, isAvailable, content) {
1111

1212
override fun sendInvite(context: Context) {
1313
super.sendInvite(context)

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/MorePresenter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.google.firebase.dynamicinvites.kotlin.model.InviteContent
77
import com.google.firebase.dynamicinvites.util.DynamicLinksUtil
88

99
class MorePresenter(isAvailable: Boolean, content: InviteContent)
10-
: InvitePresenter("More", R.drawable.ic_more_horiz_black_24dp, isAvailable, content) {
10+
: InvitePresenter("More", R.drawable.ic_more_horiz, isAvailable, content) {
1111

1212
override fun sendInvite(context: Context) {
1313
super.sendInvite(context)

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/presenter/SocialPresenter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.google.firebase.dynamicinvites.R
77
import com.google.firebase.dynamicinvites.kotlin.model.InviteContent
88

99
class SocialPresenter(isAvailable: Boolean, content: InviteContent)
10-
: InvitePresenter("Social", R.drawable.ic_people_black_24dp, isAvailable, content) {
10+
: InvitePresenter("Social", R.drawable.ic_people, isAvailable, content) {
1111

1212
override fun sendInvite(context: Context) {
1313
super.sendInvite(context)

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/AdvancedActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import android.support.v7.app.AppCompatActivity
55

66
import com.google.firebase.dynamicinvites.R
77
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
99

1010
class AdvancedActivity : AppCompatActivity(), ShareDialogFragment.Listener {
1111

1212
override fun onCreate(savedInstanceState: Bundle?) {
1313
super.onCreate(savedInstanceState)
1414
setContentView(R.layout.activity_advanced)
1515

16-
button_share.setOnClickListener {
16+
buttonShare.setOnClickListener {
1717
ShareDialogFragment.newInstance().show(supportFragmentManager, "dialog")
1818
}
1919
}

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import android.os.Bundle
55
import android.support.v7.app.AppCompatActivity
66
import com.google.firebase.dynamicinvites.R
77
import com.google.firebase.dynamicinvites.kotlin.util.DynamicLinksUtil
8-
import kotlinx.android.synthetic.main.activity_main.button_share
8+
import kotlinx.android.synthetic.main.activity_main.buttonShare
99

1010
class MainActivity : AppCompatActivity() {
1111

1212
override fun onCreate(savedInstanceState: Bundle?) {
1313
super.onCreate(savedInstanceState)
1414
setContentView(R.layout.activity_main)
1515

16-
button_share.setOnClickListener {
16+
buttonShare.setOnClickListener {
1717
onShareClicked()
1818
}
1919
}

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/kotlin/view/ShareDialogFragment.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import com.google.firebase.dynamicinvites.kotlin.presenter.MorePresenter
1717
import com.google.firebase.dynamicinvites.kotlin.presenter.SocialPresenter
1818
import com.google.firebase.dynamicinvites.kotlin.util.DynamicLinksUtil
1919
import kotlinx.android.synthetic.main.fragment_item_list_dialog.recycler
20-
import kotlinx.android.synthetic.main.item_share_method.view.item_icon
21-
import kotlinx.android.synthetic.main.item_share_method.view.item_name
20+
import kotlinx.android.synthetic.main.item_share_method.view.itemIcon
21+
import kotlinx.android.synthetic.main.item_share_method.view.itemName
2222
import java.util.Arrays
2323

2424
/**
@@ -83,8 +83,8 @@ class ShareDialogFragment : BottomSheetDialogFragment() {
8383
: RecyclerView.ViewHolder(inflater.inflate(R.layout.item_share_method, parent, false)) {
8484

8585
internal fun bind(presenter: InvitePresenter) {
86-
itemView.item_name.text = presenter.name
87-
itemView.item_icon.setImageResource(presenter.icon)
86+
itemView.itemName.text = presenter.name
87+
itemView.itemIcon.setImageResource(presenter.icon)
8888

8989
itemView.setOnClickListener {
9090
listener?.onItemClicked(presenter)

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/CopyPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
public class CopyPresenter extends InvitePresenter {
1010

1111
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);
1313
}
1414

1515
@Override

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/EmailPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
public class EmailPresenter extends InvitePresenter {
1010

1111
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);
1313
}
1414

1515
@Override

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/MessagePresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
public class MessagePresenter extends InvitePresenter {
1010

1111
public MessagePresenter(boolean isAvailable, InviteContent content) {
12-
super("Message", R.drawable.ic_sms_black_24dp, isAvailable, content);
12+
super("Message", R.drawable.ic_sms, isAvailable, content);
1313
}
1414

1515
@Override

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/MorePresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public class MorePresenter extends InvitePresenter {
1212

1313
public MorePresenter(boolean isAvailable, InviteContent content) {
14-
super("More", R.drawable.ic_more_horiz_black_24dp, isAvailable, content);
14+
super("More", R.drawable.ic_more_horiz, isAvailable, content);
1515
}
1616

1717
@Override

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/presenter/SocialPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
public class SocialPresenter extends InvitePresenter {
1010

1111
public SocialPresenter(boolean isAvailable, InviteContent content) {
12-
super("Social", R.drawable.ic_people_black_24dp, isAvailable, content);
12+
super("Social", R.drawable.ic_people, isAvailable, content);
1313
}
1414

1515
@Override

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/view/AdvancedActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ protected void onCreate(Bundle savedInstanceState) {
1414
super.onCreate(savedInstanceState);
1515
setContentView(R.layout.activity_advanced);
1616

17-
findViewById(R.id.button_share).setOnClickListener(new View.OnClickListener() {
17+
findViewById(R.id.buttonShare).setOnClickListener(new View.OnClickListener() {
1818
@Override
1919
public void onClick(View view) {
2020
ShareDialogFragment.newInstance().show(getSupportFragmentManager(), "dialog");

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/view/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ protected void onCreate(Bundle savedInstanceState) {
1616
super.onCreate(savedInstanceState);
1717
setContentView(R.layout.activity_main);
1818

19-
findViewById(R.id.button_share).setOnClickListener(new View.OnClickListener() {
19+
findViewById(R.id.buttonShare).setOnClickListener(new View.OnClickListener() {
2020
@Override
2121
public void onClick(View view) {
2222
onShareClicked();

‎dl-invites/app/src/main/java/com/google/firebase/dynamicinvites/view/ShareDialogFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ private class ViewHolder extends RecyclerView.ViewHolder {
101101
ViewHolder(LayoutInflater inflater, ViewGroup parent) {
102102
super(inflater.inflate(R.layout.item_share_method, parent, false));
103103

104-
text = itemView.findViewById(R.id.item_name);
105-
icon = itemView.findViewById(R.id.item_icon);
104+
text = itemView.findViewById(R.id.itemName);
105+
icon = itemView.findViewById(R.id.itemIcon);
106106

107107
itemView.setOnClickListener(
108108
new View.OnClickListener() {

‎dl-invites/app/src/main/res/drawable/ic_content_copy_black_24dp.xml renamed to ‎dl-invites/app/src/main/res/drawable/ic_content_copy.xml

File renamed without changes.

‎dl-invites/app/src/main/res/drawable/ic_email_black_24dp.xml renamed to ‎dl-invites/app/src/main/res/drawable/ic_email.xml

File renamed without changes.

‎dl-invites/app/src/main/res/drawable/ic_more_horiz_black_24dp.xml renamed to ‎dl-invites/app/src/main/res/drawable/ic_more_horiz.xml

File renamed without changes.

‎dl-invites/app/src/main/res/drawable/ic_people_black_24dp.xml renamed to ‎dl-invites/app/src/main/res/drawable/ic_people.xml

File renamed without changes.

‎dl-invites/app/src/main/res/drawable/ic_sms_black_24dp.xml renamed to ‎dl-invites/app/src/main/res/drawable/ic_sms.xml

File renamed without changes.

‎dl-invites/app/src/main/res/layout/activity_advanced.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
android:layout_marginBottom="8dp"
1717
android:background="#FFFFFF"
1818
app:cardCornerRadius="10dp"
19-
app:layout_constraintBottom_toTopOf="@+id/button_share"
19+
app:layout_constraintBottom_toTopOf="@+id/buttonShare"
2020
app:layout_constraintEnd_toEndOf="parent"
2121
app:layout_constraintStart_toStartOf="parent"
2222
app:layout_constraintTop_toTopOf="parent">
@@ -48,7 +48,7 @@
4848
</android.support.v7.widget.CardView>
4949

5050
<Button
51-
android:id="@+id/button_share"
51+
android:id="@+id/buttonShare"
5252
style="@style/Widget.AppCompat.Button.Colored"
5353
android:layout_width="match_parent"
5454
android:layout_height="wrap_content"

‎dl-invites/app/src/main/res/layout/activity_main.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
android:layout_marginTop="8dp"
1616
android:layout_marginEnd="8dp"
1717
android:src="@drawable/pizza_monster"
18-
app:layout_constraintBottom_toTopOf="@+id/field_link"
18+
app:layout_constraintBottom_toTopOf="@+id/fieldLink"
1919
app:layout_constraintEnd_toEndOf="parent"
2020
app:layout_constraintStart_toStartOf="parent"
2121
app:layout_constraintTop_toTopOf="parent" />
2222

2323
<TextView
24-
android:id="@+id/field_link"
24+
android:id="@+id/fieldLink"
2525
android:layout_width="match_parent"
2626
android:layout_height="0dp"
2727
android:layout_marginBottom="16dp"
@@ -30,12 +30,12 @@
3030
android:text="@string/example_link"
3131
android:textColor="#FFFFFF"
3232
android:textSize="14sp"
33-
app:layout_constraintBottom_toTopOf="@+id/button_share"
33+
app:layout_constraintBottom_toTopOf="@+id/buttonShare"
3434
app:layout_constraintEnd_toEndOf="parent"
3535
app:layout_constraintStart_toStartOf="parent" />
3636

3737
<Button
38-
android:id="@+id/button_share"
38+
android:id="@+id/buttonShare"
3939
style="@style/Widget.AppCompat.Button.Colored"
4040
android:layout_width="match_parent"
4141
android:layout_height="wrap_content"

‎dl-invites/app/src/main/res/layout/item_share_method.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:layout_height="wrap_content">
77

88
<ImageView
9-
android:id="@+id/item_icon"
9+
android:id="@+id/itemIcon"
1010
android:layout_width="36dp"
1111
android:layout_height="36dp"
1212
android:layout_marginStart="16dp"
@@ -15,19 +15,19 @@
1515
app:layout_constraintBottom_toBottomOf="parent"
1616
app:layout_constraintStart_toStartOf="parent"
1717
app:layout_constraintTop_toTopOf="parent"
18-
tools:src="@drawable/ic_people_black_24dp" />
18+
tools:src="@drawable/ic_people" />
1919

2020
<TextView
21-
android:id="@+id/item_name"
21+
android:id="@+id/itemName"
2222
android:layout_width="wrap_content"
2323
android:layout_height="wrap_content"
2424
android:layout_marginStart="16dp"
2525
android:layout_marginEnd="8dp"
2626
android:textSize="16sp"
27-
app:layout_constraintBottom_toBottomOf="@+id/item_icon"
27+
app:layout_constraintBottom_toBottomOf="@+id/itemIcon"
2828
app:layout_constraintEnd_toEndOf="parent"
29-
app:layout_constraintStart_toEndOf="@+id/item_icon"
30-
app:layout_constraintTop_toTopOf="@+id/item_icon"
29+
app:layout_constraintStart_toEndOf="@+id/itemIcon"
30+
app:layout_constraintTop_toTopOf="@+id/itemIcon"
3131
app:layout_constraintHorizontal_bias="0"
3232
tools:text="Social" />
3333

0 commit comments

Comments
 (0)