Update Color Template, update package

tuhinmas · Nov 21, 2018 · 534ac46 · 534ac46
1 parent e84fa08
commit 534ac46
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 40 deletions.
diff --git a/02.Style and Theme/MyViewAndViewGroupWithStyle/.idea/misc.xml b/02.Style and Theme/MyViewAndViewGroupWithStyle/.idea/misc.xml
diff --git a/03.RecyclerView/MyRecyclerView/.idea/misc.xml b/03.RecyclerView/MyRecyclerView/.idea/misc.xml
diff --git a/04.Navigation/MyActionBar/.idea/misc.xml b/04.Navigation/MyActionBar/.idea/misc.xml
diff --git a/04.Navigation/MyActionBar/app/src/main/res/values/colors.xml b/04.Navigation/MyActionBar/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
 </resources>
diff --git a/04.Navigation/MyNavigationDrawer/app/build.gradle b/04.Navigation/MyNavigationDrawer/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 28
     buildToolsVersion '28.0.3'
     defaultConfig {
-        applicationId "com.dicoding.mynavigationdrawer"
+        applicationId "com.dicoding.picodiploma.mynavigationdrawer"
         minSdkVersion 21
         targetSdkVersion 28
         versionCode 1

diff --git a/...gationdrawer/ExampleInstrumentedTest.java → ...gationdrawer/ExampleInstrumentedTest.java b/...gationdrawer/ExampleInstrumentedTest.java → ...gationdrawer/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.dicoding.mynavigationdrawer;
+package com.dicoding.picodiploma.mynavigationdrawer;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public void useAppContext() throws Exception {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.dicoding.mynavigationdrawer", appContext.getPackageName());
+        assertEquals("com.dicoding.picodiploma.mynavigationdrawer", appContext.getPackageName());
     }
 }
diff --git a/04.Navigation/MyNavigationDrawer/app/src/main/AndroidManifest.xml b/04.Navigation/MyNavigationDrawer/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.dicoding.mynavigationdrawer">
+    package="com.dicoding.picodiploma.mynavigationdrawer">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <application

diff --git a/...ding/mynavigationdrawer/HomeFragment.java → ...loma/mynavigationdrawer/HomeFragment.java b/...ding/mynavigationdrawer/HomeFragment.java → ...loma/mynavigationdrawer/HomeFragment.java
@@ -1,4 +1,4 @@
-package com.dicoding.mynavigationdrawer;
+package com.dicoding.picodiploma.mynavigationdrawer;
 
 
 import android.os.Bundle;

diff --git a/...ding/mynavigationdrawer/MainActivity.java → ...loma/mynavigationdrawer/MainActivity.java b/...ding/mynavigationdrawer/MainActivity.java → ...loma/mynavigationdrawer/MainActivity.java
@@ -1,4 +1,4 @@
-package com.dicoding.mynavigationdrawer;
+package com.dicoding.picodiploma.mynavigationdrawer;
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -141,7 +141,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
 
         Fragment fragment = null;
 
-        String title;
+        String title = "";
 
         if (id == R.id.nav_home) {
 
@@ -153,17 +153,17 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
             Gunakanlah setarguments untuk mengirimkan data ke fragmet
              */
             title = "Camera";
-            fragment = new HalamanFragment();
-            bundle.putString(HalamanFragment.EXTRAS, title);
+            fragment = new PageFragment();
+            bundle.putString(PageFragment.EXTRAS, title);
             fragment.setArguments(bundle);
 
         } else if (id == R.id.nav_gallery) {
             /*
             Gunakanlah setarguments untuk mengirimkan data ke fragmet
              */
             title = "Gallery";
-            fragment = new HalamanFragment();
-            bundle.putString(HalamanFragment.EXTRAS, title);
+            fragment = new PageFragment();
+            bundle.putString(PageFragment.EXTRAS, title);
             fragment.setArguments(bundle);
 
         } else if (id == R.id.nav_slideshow) {
@@ -187,7 +187,8 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
                     .commit();
         }
 
-        DrawerLayout drawer = findViewById(R.id.drawer_layout);
+        if (getSupportActionBar() != null)
+            getSupportActionBar().setTitle(title);
         drawer.closeDrawer(GravityCompat.START);
         return true;
     }

diff --git a/...g/mynavigationdrawer/HalamanFragment.java → ...loma/mynavigationdrawer/PageFragment.java b/...g/mynavigationdrawer/HalamanFragment.java → ...loma/mynavigationdrawer/PageFragment.java
@@ -1,4 +1,4 @@
-package com.dicoding.mynavigationdrawer;
+package com.dicoding.picodiploma.mynavigationdrawer;
 
 
 import android.app.Activity;
@@ -17,13 +17,13 @@
 /**
  * A simple {@link Fragment} subclass.
  */
-public class HalamanFragment extends Fragment {
+public class PageFragment extends Fragment {
 
     public static final String EXTRAS = "extras";
 
     TextView textView;
 
-    public HalamanFragment() {
+    public PageFragment() {
         // Required empty public constructor
     }
 

diff --git a/04.Navigation/MyNavigationDrawer/app/src/main/res/drawable/side_nav_bar.xml b/04.Navigation/MyNavigationDrawer/app/src/main/res/drawable/side_nav_bar.xml
@@ -1,9 +1,9 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient
-        android:angle="270"
-        android:centerColor="#7986CB"
-        android:endColor="#C5CAE9"
-        android:startColor="#3F51B5"
+        android:angle="90"
+        android:centerColor="#009688"
+        android:endColor="#00695C"
+        android:startColor="#4DB6AC"
         android:type="linear" />
 </shape>
diff --git a/04.Navigation/MyNavigationDrawer/app/src/main/res/layout/app_bar_main.xml b/04.Navigation/MyNavigationDrawer/app/src/main/res/layout/app_bar_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="com.dicoding.mynavigationdrawer.MainActivity">
+    tools:context="com.dicoding.picodiploma.mynavigationdrawer.MainActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:context="com.dicoding.mynavigationdrawer.MainActivity"
+        tools:context="com.dicoding.picodiploma.mynavigationdrawer.MainActivity"
         tools:showIn="@layout/app_bar_main" />
 
     <android.support.design.widget.FloatingActionButton

diff --git a/04.Navigation/MyNavigationDrawer/app/src/main/res/layout/fragment_page.xml b/04.Navigation/MyNavigationDrawer/app/src/main/res/layout/fragment_page.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.dicoding.mynavigationdrawer.HalamanFragment">
+    tools:context="com.dicoding.picodiploma.mynavigationdrawer.PageFragment">
 
     <TextView
         android:id="@+id/tv_fragment"

diff --git a/04.Navigation/MyNavigationDrawer/app/src/main/res/values/colors.xml b/04.Navigation/MyNavigationDrawer/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
 </resources>
diff --git a/...g/mynavigationdrawer/ExampleUnitTest.java → ...a/mynavigationdrawer/ExampleUnitTest.java b/...g/mynavigationdrawer/ExampleUnitTest.java → ...a/mynavigationdrawer/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.dicoding.mynavigationdrawer;
+package com.dicoding.picodiploma.mynavigationdrawer;
 
 import org.junit.Test;
 

diff --git a/05.Localization/MyLocalization/.idea/misc.xml b/05.Localization/MyLocalization/.idea/misc.xml
diff --git a/...on/app/src/main/res/values-id/strings.xml → ...on/app/src/main/res/values-in/strings.xml b/...on/app/src/main/res/values-id/strings.xml → ...on/app/src/main/res/values-in/strings.xml
diff --git a/05.Localization/MyLocalization/app/src/main/res/values/colors.xml b/05.Localization/MyLocalization/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
 </resources>
diff --git a/06.LearnEspresso/LearnEspresso/.idea/misc.xml b/06.LearnEspresso/LearnEspresso/.idea/misc.xml
diff --git a/06.LearnEspresso/LearnEspresso/app/src/main/res/values/colors.xml b/06.LearnEspresso/LearnEspresso/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
 </resources>