Skip to content

Commit 1aa20e2

Browse files
MihaiCristianCondreaMihaiCristianCondrea
authored
Merge pull request #77 from MihaiCristianCondrea/codex/replace-materialbutton-with-buttongroup
Showcase multiple home actions with a button group
2 parents eca9bec + 4902118 commit 1aa20e2

File tree

30 files changed

+91
-17
lines changed

30 files changed

+91
-17
lines changed

‎app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeFragment.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
6363
new FastScrollerBuilder(binding.scrollView)
6464
.useMd2Style()
6565
.build();
66-
binding.btnGooglePlay.setOnClickListener(v -> startActivity(homeViewModel.getOpenPlayStoreIntent()));
66+
binding.btnGooglePlay.setOnClickListener(v ->
67+
startActivity(homeViewModel.getOpenPlayStoreIntent()));
68+
binding.btnLearnMore.setOnClickListener(v ->
69+
startActivity(homeViewModel.getLearnMoreIntent()));
6770
}
6871

6972
@Override

‎app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/home/HomeViewModel.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@ public Intent getOpenPlayStoreIntent() {
9999
return buildPlayStoreIntent(getPlayStoreUrlUseCase.invoke());
100100
}
101101

102+
public Intent getLearnMoreIntent() {
103+
return new Intent(Intent.ACTION_VIEW, Uri.parse("https://developer.android.com"));
104+
}
105+
102106
/**
103107
* Builds an intent to open the Google Play listing for the provided package.
104108
*/

‎app/src/main/res/layout/fragment_home.xml‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,28 @@
115115
android:layout_marginTop="8dp"
116116
android:orientation="horizontal">
117117

118-
<com.google.android.material.button.MaterialButton
119-
android:id="@+id/btn_google_play"
118+
<com.google.android.material.button.MaterialButtonToggleGroup
119+
android:id="@+id/home_action_button_group"
120+
style="@style/Widget.App.ButtonGroup"
120121
android:layout_width="wrap_content"
121-
android:layout_height="wrap_content"
122-
android:text="@string/get_on_google_play"
123-
app:icon="@drawable/ic_play_store_tinted" />
122+
android:layout_height="wrap_content">
123+
124+
<com.google.android.material.button.MaterialButton
125+
android:id="@+id/btn_google_play"
126+
android:layout_width="wrap_content"
127+
android:layout_height="wrap_content"
128+
android:checkable="false"
129+
android:text="@string/get_on_google_play"
130+
app:icon="@drawable/ic_play_store_tinted" />
131+
132+
<com.google.android.material.button.MaterialButton
133+
android:id="@+id/btn_learn_more"
134+
android:layout_width="wrap_content"
135+
android:layout_height="wrap_content"
136+
android:checkable="false"
137+
android:text="@string/learn_more" />
138+
139+
</com.google.android.material.button.MaterialButtonToggleGroup>
124140
</androidx.appcompat.widget.LinearLayoutCompat>
125141
</androidx.appcompat.widget.LinearLayoutCompat>
126142
</com.google.android.material.card.MaterialCardView>

‎app/src/main/res/values-ar-rEG/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<string name="main_card_subtitle">بإصدارات Kotlin و Java</string>
1818
<string name="main_card_description">تم تحديث إصدار Kotlin بدروس ديناميكية ومساعد ذكاء اصطناعي والمزيد. جرب مستقبل تطوير تطبيقات أندرويد!</string>
1919
<string name="get_on_google_play">نزّله من على Google Play</string>
20+
<string name="learn_more">اعرف المزيد</string>
2021
<string name="play_store">متجر Play</string>
2122

2223
<string name="android_studio">أندرويد ستوديو</string>

‎app/src/main/res/values-bg-rBG/strings.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<string name="main_card_subtitle">Представяме издания за Kotlin и Java</string>
1818
<string name="main_card_description">Изданието за Kotlin е актуализирано с динамични уроци, AI асистент и още. Изживейте бъдещето на разработката за Android!</string>
1919
<string name="get_on_google_play">Вземете от Google Play</string>
20+
<string name="learn_more">Научете повече</string>
21+
<string name="play_store">Play Store</string>
2022

2123
<string name="android_studio">Android Studio</string>
2224

@@ -400,7 +402,6 @@
400402
<string name="firebase_crashlytics">Катастрофа</string>
401403
<string name="firebase_analytics">Анализ на пожарната база</string>
402404
<string name="firebase_performance">Firebase Performance</string>
403-
<string name="play_store">Play Store</string>
404405
<string name="special">Специални</string>
405406
<string name="wake_lock">Дръж устройството будно.</string>
406407
<string name="summary_preference_permissions_wake_lock">Позволява на приложението да попречи на устройството да заспи (напр. затъмняване на екрана или заспиване на процесора) по време на критичните операции, за да се гарантира, че те завършват без прекъсване. Това се използва пестеливо, за да се запази батерията.</string>

‎app/src/main/res/values-bn-rBD/strings.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<string name="main_card_subtitle">কোটলিন এবং জাভা সংস্করণ সহ</string>
1818
<string name="main_card_description">কোটলিন সংস্করণটি ডাইনামিক পাঠ, এআই সহকারী এবং আরও অনেক কিছু দিয়ে আপডেট করা হয়েছে। অ্যান্ড্রয়েড ডেভেলপমেন্টের ভবিষ্যৎ অভিজ্ঞতা নিন!</string>
1919
<string name="get_on_google_play">গুগল প্লে থেকে পান</string>
20+
<string name="learn_more">আরও জানুন</string>
21+
<string name="play_store">প্লে স্টোর</string>
2022

2123
<string name="android_studio">অ্যান্ড্রয়েড স্টুডিও</string>
2224

@@ -400,7 +402,6 @@
400402
<string name="firebase_crashlytics">ফায়ারবেথ অ্যাকসিটিভ</string>
401403
<string name="firebase_analytics">অগ্নিময় এনালিস্ট</string>
402404
<string name="firebase_performance">জর্মন</string>
403-
<string name="play_store">সংরক্ষণ</string>
404405
<string name="special">বিশেষ</string>
405406
<string name="wake_lock">/_সহায়তা/_সম্বন্ধে</string>
406407
<string name="summary_preference_permissions_wake_lock">অ্যাপ্লিকেশন দ্বারা নিদ্রিত অবস্থায় স্থাপনার পূর্বে ডিভাইসটি নিদ্রিত অবস্থা প্রদর্শন করা হবে (যেমন, পর্দার ক্ষেত্রে) অথবা প্রসেসর নিদ্রিত অবস্থায় না থাকলে অনুরোধ জানানো হবে। ব্যাটারি সংরক্ষণের জন্য এটি ব্যবহার করা হয়।</string>

‎app/src/main/res/values-de-rDE/strings.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<string name="main_card_subtitle">Mit Kotlin- und Java-Editionen</string>
1818
<string name="main_card_description">Die Kotlin-Edition wurde mit dynamischen Lektionen, KI-Assistent und mehr aktualisiert. Erlebe die Zukunft der Android-Entwicklung!</string>
1919
<string name="get_on_google_play">Jetzt bei Google Play</string>
20+
<string name="learn_more">Mehr erfahren</string>
21+
<string name="play_store">Play Store</string>
2022

2123
<string name="android_studio">Android Studio</string>
2224

@@ -400,7 +402,6 @@
400402
<string name="firebase_crashlytics">Firebase Crashlytics</string>
401403
<string name="firebase_analytics">Firebase Analytics</string>
402404
<string name="firebase_performance">Firebase Performance</string>
403-
<string name="play_store">Play Store</string>
404405
<string name="special">Spezial</string>
405406
<string name="wake_lock">Gerät wach halten [WAKE_LOCK]</string>
406407
<string name="summary_preference_permissions_wake_lock">Ermöglicht der App, dass das Gerät während kritischer Operationen nicht schlafen (z.B. Bildschirmdimmen oder Prozessorschlafen), um sicherzustellen, dass sie ohne Unterbrechung abschließen. Dies wird sparsam verwendet, um Batterie zu erhalten.</string>

‎app/src/main/res/values-es-rGQ/strings.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<string name="main_card_subtitle">Con ediciones para Kotlin y Java</string>
1818
<string name="main_card_description">La edición de Kotlin se ha actualizado con lecciones dinámicas, asistente de IA y más. ¡Experimenta el futuro del desarrollo de Android!</string>
1919
<string name="get_on_google_play">Consíguelo en Google Play</string>
20+
<string name="learn_more">Más información</string>
21+
<string name="play_store">Play Store</string>
2022

2123
<string name="android_studio">Android Studio</string>
2224

@@ -400,7 +402,6 @@
400402
<string name="firebase_crashlytics">Firebase Crashlytics</string>
401403
<string name="firebase_analytics">Firebase Analytics</string>
402404
<string name="firebase_performance">Firebase Performance</string>
403-
<string name="play_store">Play Store</string>
404405
<string name="special">Especial</string>
405406
<string name="wake_lock">Mantenga el dispositivo despierto [WAKE_LOCK]</string>
406407
<string name="summary_preference_permissions_wake_lock">Permite que la aplicación impida que el dispositivo se vaya a dormir (por ejemplo, atenuación de pantalla o sueño de procesador) durante operaciones críticas para asegurar que completen sin interrupción. Esto se utiliza con moderación para conservar la batería.</string>

‎app/src/main/res/values-es-rMX/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<string name="main_card_subtitle">Con ediciones de Kotlin y Java</string>
1818
<string name="main_card_description">La edición de Kotlin ha sido actualizada con lecciones dinámicas, asistente de IA y más. ¡Experimenta el futuro del desarrollo de Android!</string>
1919
<string name="get_on_google_play">Descárgala en Google Play</string>
20+
<string name="learn_more">Más información</string>
2021
<string name="play_store">Play Store</string>
2122

2223
<string name="android_studio">Android Studio</string>

‎app/src/main/res/values-fil-rPH/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<string name="main_card_subtitle">Nagtatampok ng mga Edisyon ng Kotlin at Java</string>
1818
<string name="main_card_description">Ang Kotlin Edition ay na-update na may mga dynamic na aralin, AI assistant, at marami pa. Damhin ang hinaharap ng Android development!</string>
1919
<string name="get_on_google_play">Kunin ito sa Google Play</string>
20+
<string name="learn_more">Matuto pa</string>
2021
<string name="play_store">Play Store</string>
2122

2223
<string name="android_studio">Android Studio</string>

0 commit comments

Comments
 (0)