Updates (#136)

* update * updates issue
Madonahs · May 3, 2018 · 4414777 · 4414777
1 parent 05bd3f7
commit 4414777
Show file tree

Hide file tree

Showing 10 changed files with 97 additions and 30 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/Bug_Report.md b/Bug_Report.md
@@ -0,0 +1,35 @@
+---
+name: When You spot a bug
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/app/build.gradle b/app/build.gradle
@@ -36,8 +36,8 @@ dependencies {
     implementation 'com.android.support:support-v4:27.0.2'
     implementation 'com.android.support:support-vector-drawable:27.0.2'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile "com.android.support:design:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support.constraint:constraint-layout:$rootProject.ext.constraintLayoutVersion"
+    implementation "com.android.support:design:$rootProject.ext.supportLibraryVersion"
+    implementation "com.android.support.constraint:constraint-layout:$rootProject.ext.constraintLayoutVersion"
     implementation "com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
 
     // Test libraries
@@ -46,22 +46,22 @@ dependencies {
     androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.ext.espressoVersion"
 
     //AhoyOnBoard library
-    compile "com.codemybrainsout.onboarding:onboarder:$rootProject.ext.onBoarderVersion"
-    compile "com.jonathanfinerty.once:once:$rootProject.ext.onceVersion"
+    implementation "com.codemybrainsout.onboarding:onboarder:$rootProject.ext.onBoarderVersion"
+    implementation "com.jonathanfinerty.once:once:$rootProject.ext.onceVersion"
 
     // Butterknife
-    compile "com.jakewharton:butterknife:$rootProject.ext.butterKnifeVersion"
+    implementation "com.jakewharton:butterknife:$rootProject.ext.butterKnifeVersion"
     annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.ext.butterKnifeVersion"
 
     // Dagger
-    compile "com.google.dagger:dagger-android:$rootProject.ext.daggerVersion"
-    compile "com.google.dagger:dagger-android-support:$rootProject.ext.daggerVersion"
+    implementation "com.google.dagger:dagger-android:$rootProject.ext.daggerVersion"
+    implementation "com.google.dagger:dagger-android-support:$rootProject.ext.daggerVersion"
     // if you use the support libraries
     annotationProcessor "com.google.dagger:dagger-android-processor:$rootProject.ext.daggerVersion"
     annotationProcessor "com.google.dagger:dagger-compiler:$rootProject.ext.daggerVersion"
 
     // CircleImageView Lib
-    compile "de.hdodenhof:circleimageview:$rootProject.ext.circleImageViewVersion"
+    implementation "de.hdodenhof:circleimageview:$rootProject.ext.circleImageViewVersion"
 
     // Facebook SDK
     implementation "com.facebook.android:facebook-login:$rootProject.ext.facebookLoginVersion"
@@ -80,11 +80,11 @@ dependencies {
     implementation "com.google.android.gms:play-services-auth:$rootProject.ext.playServicesVersion"
 
 
-    compile 'org.jetbrains:annotations-java5:15.0'
-    compile 'com.google.android.gms:play-services-maps:11.8.0'
+    implementation 'org.jetbrains:annotations-java5:15.0'
+    implementation 'com.google.android.gms:play-services-maps:11.8.0'
 
     // Material SearchView
-    compile 'com.miguelcatalan:materialsearchview:1.4.0'
+   implementation 'com.miguelcatalan:materialsearchview:1.4.0'
 
 
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -72,10 +72,11 @@
             android:theme="@style/AppTheme" />
         <activity
             android:name=".activities.AboutActivity"
-            android:theme="@style/AppTheme" />
+            />
         <activity
             android:name=".activities.HelpActivity"
-            android:theme="@style/AppTheme" />
+            android:parentActivityName=".activities.MainActivity"
+            android:label="@string/help"/>
         <activity android:name=".activities.ManageProfileActivity" />
         <activity android:name=".activities.MessageActivity"></activity>
     </application>

diff --git a/app/src/main/java/com/madonasyombua/growwithgoogleteamproject/activities/AboutActivity.java b/app/src/main/java/com/madonasyombua/growwithgoogleteamproject/activities/AboutActivity.java
@@ -26,22 +26,23 @@
 public class AboutActivity extends AppCompatActivity {
 
 
-    private ImageButton imageButton;
+    //private ImageButton imageButton;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
         ButterKnife.bind(this);
 
-        imageButton = findViewById(R.id.backToNavDrawer);
+
+        /*imageButton = findViewById(R.id.backToNavDrawer);
         imageButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(AboutActivity.this, MainActivity.class);
                 startActivity(intent);
 
             }
-        });
+        });*/
 
     }
 }
diff --git a/app/src/main/java/com/madonasyombua/growwithgoogleteamproject/activities/HelpActivity.java b/app/src/main/java/com/madonasyombua/growwithgoogleteamproject/activities/HelpActivity.java
@@ -41,10 +41,8 @@
 
 public class HelpActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
 
-    // SearchView
-
     private MaterialSearchView searchView;
-    private ImageButton backToMain;
+    //private ImageButton backToMain;
     @BindView(R.id.faq)TextView faq;
     @BindView(R.id.contact)TextView contact;
     @BindView(R.id.terms) TextView terms;
@@ -110,15 +108,15 @@ public void onSearchViewClosed() {
 
 
 
-        backToMain = findViewById(R.id.backToMain);
+      /*  backToMain = findViewById(R.id.backToMain);
         backToMain.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent intent = new Intent(HelpActivity.this, MainActivity.class);
                 startActivity(intent);
 
             }
-        });
+        });*/
 
         faq.setOnClickListener(new View.OnClickListener() {
             @Override

diff --git a/app/src/main/java/com/madonasyombua/growwithgoogleteamproject/adapter/FeedsAdapter.java b/app/src/main/java/com/madonasyombua/growwithgoogleteamproject/adapter/FeedsAdapter.java
@@ -85,7 +85,6 @@ public FeedsAdapter.ViewHolder onCreateViewHolder(final ViewGroup parent, int vi
     public void onBindViewHolder(ViewHolder holder, int position) {
 
         Post post = mPosts.get(position);
-        // holder.mUsername.setText(post.getUser().getUsername());
         holder.mName.setText(post.getUsername());
         holder.mPostProfilePicture.setImageBitmap(null);
         holder.mPostProfilePicture.setImageResource(R.drawable.default_pic);

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -23,13 +23,13 @@
     android:background="@drawable/back_dev"
     tools:layout_editor_absoluteY="25dp">
     <!-- app Bar -->
-    <android.support.design.widget.AppBarLayout
+   <!-- <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:elevation="6dp"
         android:theme="@style/AppTheme.NoActionBar">
-        <!-- the back image button to take you back to main activity-->
+
 
         <ImageButton
             android:id="@+id/backToNavDrawer"
@@ -39,7 +39,7 @@
             android:background="?attr/selectableItemBackgroundBorderless"
             android:src="@drawable/ic_action_back" />
 
-    </android.support.design.widget.AppBarLayout>
+    </android.support.design.widget.AppBarLayout>-->
 
     <!-- all Textview used to display current text on layout.-->
     <android.support.constraint.ConstraintLayout
@@ -79,7 +79,7 @@
         <TextView
             android:id="@+id/about_detail"
             android:layout_width="wrap_content"
-            android:layout_height="188dp"
+            android:layout_height="242dp"
             android:layout_marginEnd="8dp"
             android:layout_marginStart="8dp"
             android:padding="8dp"

diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
@@ -21,7 +21,7 @@
     android:background="?attr/backgroundcolor"
     tools:context="com.madonasyombua.growwithgoogleteamproject.activities.HelpActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <!--<android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -48,7 +48,7 @@
                 android:contentDescription="@string/back" />
         </LinearLayout>
 
-    </android.support.design.widget.AppBarLayout>
+    </android.support.design.widget.AppBarLayout>-->
 
 
     <!-- Faq page loads faq for user -->

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -82,7 +82,12 @@
     <string name="terms">Terms and Conditions</string>
     <string name="back">Back</string>
     <string name="about">About</string>
-    <string name="about_detail">The project is meant to help programmers have a portfolio sharing platform, programmers are welcome to share their projects and they can interact and show employers what they have done in the app, one doesnt have to create a website to showcase his/her work. The project was done by team members participating in the Grow With Google Scholarship Program offered by Google|Udacity.</string>
+    <string name="about_detail">The project is meant to help programmers have a portfolio sharing platform,
+        programmers are welcome to share their projects and they can interact and show employers what
+        they have done in the app, one does not have to create a website to showcase his/her work.
+        The project was done by team members participating in the Grow With Google Scholarship Program offered by Google|Udacity.The team
+        was happy to get into phase two of the Grow With Google Scholarship.
+    </string>
     <string name="about_developer_heading">Developers</string>
     <string name="about_developer_name1">Madonah Syombua</string>
     <string name="about_developer_name2">Rado RAMBININTSOA</string>
@@ -257,7 +262,7 @@
     <string name="message">We will implement message here</string>
     <string name="image">Image</string>
     <string name="timeout">timeout</string>
-
+    <string name="help">Help</string>
 
 
 </resources>