stable version 0.0.2

1. add teachers to nav 2. back pressed goes to home first 2. working on alarm before class and auto silent
unitools-apps · Nov 26, 2018 · cde6289 · cde6289
1 parent ffc1bc5
commit cde6289
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 153 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,7 @@ android {
         applicationId "com.github.ali77gh.unitools"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
+        versionName '0.0.2 beta'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -34,14 +33,11 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:0.5'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
     implementation files('libs/easydataandroid.jar')
-
     compile 'com.google.code.gson:gson:2.8.0'
     //gson
     compile 'com.journeyapps:zxing-android-embedded:3.6.0'
     //Qr code library
     compile 'com.android.support:cardview-v7:28.0.0'
-
     implementation 'com.android.support:design:28.0.0'
-
-    implementation  'com.android.support:multidex:1.0.3'
+    implementation 'com.android.support:multidex:1.0.3'
 }
diff --git a/app/src/main/java/com/github/ali77gh/unitools/uI/activities/HomeActivity.java b/app/src/main/java/com/github/ali77gh/unitools/uI/activities/HomeActivity.java
@@ -18,6 +18,7 @@
 import com.github.ali77gh.unitools.uI.fragments.StorageFragment;
 import com.github.ali77gh.unitools.uI.fragments.DocsFragment;
 import com.github.ali77gh.unitools.uI.fragments.SettingsFragment;
+import com.github.ali77gh.unitools.uI.fragments.TeachersFragment;
 import com.github.ali77gh.unitools.uI.fragments.WallFragment;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
@@ -51,32 +52,42 @@ private void SetupNav() {
         StorageFragment storageFragment = new StorageFragment();
         DocsFragment docsFragment = new DocsFragment();
         SettingsFragment settingsFragment = new SettingsFragment();
+        TeachersFragment teachersFragment = new TeachersFragment();
+
+        viewPagerAdapter.AddFragment(teachersFragment);
+        viewPagerAdapter.AddFragment(docsFragment);
         viewPagerAdapter.AddFragment(wallFragment);
         viewPagerAdapter.AddFragment(storageFragment);
-        viewPagerAdapter.AddFragment(docsFragment);
         viewPagerAdapter.AddFragment(settingsFragment);
+
+        viewpager.post(() -> viewpager.setCurrentItem(2,false));
+
         currentFrag = wallFragment;
         viewpager.setAdapter(viewPagerAdapter);
     }
 
     private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener = item -> {
         switch (item.getItemId()) {
-            case R.id.navigation_home:
+            case R.id.navigation_teacher:
                 viewpager.setCurrentItem(0, true);
                 currentFrag = (Backable) viewPagerAdapter.getItem(0);
                 return true;
-            case R.id.navigation_storage:
+            case R.id.navigation_docs:
                 viewpager.setCurrentItem(1, true);
                 currentFrag = (Backable) viewPagerAdapter.getItem(1);
                 return true;
-            case R.id.navigation_docs:
+            case R.id.navigation_home:
                 viewpager.setCurrentItem(2, true);
                 currentFrag = (Backable) viewPagerAdapter.getItem(2);
                 return true;
-            case R.id.navigation_settings:
+            case R.id.navigation_storage:
                 viewpager.setCurrentItem(3, true);
                 currentFrag = (Backable) viewPagerAdapter.getItem(3);
                 return true;
+            case R.id.navigation_settings:
+                viewpager.setCurrentItem(4, true);
+                currentFrag = (Backable) viewPagerAdapter.getItem(4);
+                return true;
         }
 
         return false;
@@ -91,15 +102,18 @@ public void onPageScrolled(int i, float v, int i1) {
         public void onPageSelected(int i) {
             switch (i) {
                 case 0:
-                    navigation.setSelectedItemId(R.id.navigation_home);
+                    navigation.setSelectedItemId(R.id.navigation_teacher);
                     break;
                 case 1:
-                    navigation.setSelectedItemId(R.id.navigation_storage);
+                    navigation.setSelectedItemId(R.id.navigation_docs);
                     break;
                 case 2:
-                    navigation.setSelectedItemId(R.id.navigation_docs);
+                    navigation.setSelectedItemId(R.id.navigation_home);
                     break;
                 case 3:
+                    navigation.setSelectedItemId(R.id.navigation_storage);
+                    break;
+                case 4:
                     navigation.setSelectedItemId(R.id.navigation_settings);
                     break;
                 default:
@@ -150,6 +164,11 @@ private void SetupLang() {
     @Override
     public void onBackPressed() {
         if (!currentFrag.onBack()) {
+
+            if (viewpager.getCurrentItem()!=2){
+                viewpager.setCurrentItem(2,true);
+                return;
+            }
             super.onBackPressed();
         }
     }

diff --git a/app/src/main/java/com/github/ali77gh/unitools/uI/fragments/HelpFragment.java b/app/src/main/java/com/github/ali77gh/unitools/uI/fragments/HelpFragment.java
diff --git a/...itools/uI/fragments/TransferFragment.java → ...itools/uI/fragments/TeachersFragment.java b/...itools/uI/fragments/TransferFragment.java → ...itools/uI/fragments/TeachersFragment.java
@@ -12,9 +12,9 @@
  * Created by ali on 10/3/18.
  */
 
-public class TransferFragment extends Fragment implements Backable {
+public class TeachersFragment extends Fragment implements Backable {
 
-    public TransferFragment() {
+    public TeachersFragment() {
         // Required empty public constructor
     }
 
@@ -28,7 +28,7 @@ public void onCreate(Bundle savedInstanceState) {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_transfer, container, false);
+        return inflater.inflate(R.layout.fragment_teachers, container, false);
     }
 
     @Override

diff --git a/app/src/main/java/com/github/ali77gh/unitools/uI/fragments/ToolsFragment.java b/app/src/main/java/com/github/ali77gh/unitools/uI/fragments/ToolsFragment.java
diff --git a/app/src/main/java/com/github/ali77gh/unitools/uI/fragments/WallFragment.java b/app/src/main/java/com/github/ali77gh/unitools/uI/fragments/WallFragment.java
@@ -6,6 +6,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
@@ -38,7 +39,6 @@
 
 public class WallFragment extends Fragment implements Backable {
 
-    private ImageView setWeekCounter;
     private LinearLayout weekNummberParent;
 
     private ImageView expandClassesBtn;
@@ -75,7 +75,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         // Inflate the layout for this fragment
         View cView = inflater.inflate(R.layout.fragment_wall, container, false);
 
-        setWeekCounter = cView.findViewById(R.id.btn_wall_setup_week_counter);
         weekNummberParent = cView.findViewById(R.id.linear_wall_week_number_parent);
 
         addClassBtn = cView.findViewById(R.id.btn_wall_add_class);
@@ -104,7 +103,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     }
 
     private void SetupWeekCounter() {
-        setWeekCounter.setOnClickListener(view -> {
+        weekNummberParent.setOnClickListener(view -> {
             SetupWeekCounterDialog dialog = new SetupWeekCounterDialog(getActivity());
             dialog.show();
             dialog.setOnDismissListener(dialogInterface -> {

diff --git a/...c/main/res/drawable/home_drawer_jozve.xml → app/src/main/res/drawable/home_nav_docs.xml b/...c/main/res/drawable/home_drawer_jozve.xml → app/src/main/res/drawable/home_nav_docs.xml
diff --git a/...ain/res/drawable/home_drawer_settings.xml → ...c/main/res/drawable/home_nav_settings.xml b/...ain/res/drawable/home_drawer_settings.xml → ...c/main/res/drawable/home_nav_settings.xml
diff --git a/...main/res/drawable/home_drawer_baygani.xml → ...rc/main/res/drawable/home_nav_storage.xml b/...main/res/drawable/home_drawer_baygani.xml → ...rc/main/res/drawable/home_nav_storage.xml
diff --git a/app/src/main/res/drawable/home_nav_teacher.png b/app/src/main/res/drawable/home_nav_teacher.png
diff --git a/...rc/main/res/drawable/home_drawer_wall.xml → app/src/main/res/drawable/home_nav_wall.xml b/...rc/main/res/drawable/home_drawer_wall.xml → app/src/main/res/drawable/home_nav_wall.xml
diff --git a/app/src/main/res/layout/fragment_help.xml b/app/src/main/res/layout/fragment_help.xml
diff --git a/app/src/main/res/layout/fragment_tools.xml → ...src/main/res/layout/fragment_teachers.xml b/app/src/main/res/layout/fragment_tools.xml → ...src/main/res/layout/fragment_teachers.xml
@@ -6,7 +6,8 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="friends"
+        android:text="@string/coming_soon"
+        android:textColor="@color/white"
         android:layout_gravity="center"/>
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_transfer.xml b/app/src/main/res/layout/fragment_transfer.xml
diff --git a/app/src/main/res/layout/fragment_wall.xml b/app/src/main/res/layout/fragment_wall.xml
@@ -50,17 +50,6 @@
                             android:visibility="visible" />
 
                     </LinearLayout>
-
-                    <ImageView
-                        android:id="@+id/btn_wall_setup_week_counter"
-                        android:layout_width="30dp"
-                        android:layout_height="30dp"
-                        android:src="@drawable/home_drawer_settings"
-                        android:tint="@color/white"
-                        android:padding="5dp"
-                        android:layout_gravity="center_vertical|start"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginBottom="4dp"/>
                 </FrameLayout>
 
 

diff --git a/app/src/main/res/menu/home_navigation.xml b/app/src/main/res/menu/home_navigation.xml
@@ -1,24 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <item
+        android:id="@+id/navigation_teacher"
+        android:icon="@drawable/home_nav_teacher"
+        android:title="@string/teacher" />
+
+    <item
+        android:id="@+id/navigation_docs"
+        android:icon="@drawable/home_nav_docs"
+        android:title="@string/doc_founder" />
+
     <item
         android:id="@+id/navigation_home"
-        android:icon="@drawable/home_drawer_wall"
+        android:icon="@drawable/home_nav_wall"
         android:title="@string/home" />
 
+
     <item
         android:id="@+id/navigation_storage"
-        android:icon="@drawable/home_drawer_baygani"
+        android:icon="@drawable/home_nav_storage"
         android:title="@string/storage" />
 
-    <item
-        android:id="@+id/navigation_docs"
-        android:icon="@drawable/home_drawer_jozve"
-        android:title="@string/doc_founder" />
 
     <item
         android:id="@+id/navigation_settings"
-        android:icon="@drawable/home_drawer_settings"
+        android:icon="@drawable/home_nav_settings"
         android:title="@string/settings" />
 
 </menu>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
@@ -73,6 +73,7 @@
     <string name="next_class_is_close"> کلاس بعدی نزدیک است</string>
     <string name="how_match_before_class_start_time">چقدر قبلش؟</string>
     <string name="notification_type">نوع اعلان</string>
+    <string name="teacher">اساتید</string>
 
     <string-array name="nums">
         <item>۰</item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -6,7 +6,7 @@
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="home_fragment">home fragment</string>
 
-    <string name="app_version">version 0.0.1 beta</string>
+    <string name="app_version">version 0.0.2 beta</string>
 
     <string name="about_text">felan va bisar felan va bisar felan va bisar felan va bisar felan va bisar felan va bisar felan va bisar felan va bisar felan va bisar felan va bisar felan va bisar felan va bisar felan va bisar </string>
     <string name="language">language</string>
@@ -77,6 +77,7 @@
     <string name="next_class_is_close"> next class is close</string>
     <string name="how_match_before_class_start_time">how match before class start time?</string>
     <string name="notification_type">notification type</string>
+    <string name="teacher">teacher</string>
 
     <string-array name="nums">
         <item>0</item>